mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-27 07:37:33 +00:00
3c94c7bc02
Problems reported by Mattias Engdegård in: https://lists.gnu.org/r/emacs-devel/2019-03/msg00085.html * admin/admin.el (set-version): * lisp/allout.el (allout-latexify-one-item): * lisp/arc-mode.el (archive-arc-rename-entry) (archive-rar-summarize): * lisp/calc/calc-graph.el (calc-graph-set-styles) (calc-graph-hide): * lisp/calc/calc-help.el (calc-describe-key): * lisp/calc/calc-lang.el (math-compose-tex-func, eqn): * lisp/calc/calc.el (calcDigit-key): * lisp/cedet/ede/makefile-edit.el (makefile-macro-file-list): * lisp/cedet/ede/speedbar.el (ede-tag-expand): * lisp/cedet/semantic/sb.el (semantic-sb-show-extra) (semantic-sb-expand-group): * lisp/comint.el (comint-substitute-in-file-name): * lisp/dired.el (dired-actual-switches): * lisp/emacs-lisp/chart.el (chart-rmail-from): * lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand): * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand): * lisp/emacs-lisp/rx.el (rx-not, rx-atomic-p): * lisp/emulation/viper-ex.el (viper-get-ex-token) (viper-get-ex-pat, ex-set-read-variable): * lisp/epg.el (epg--status-SIG_CREATED): * lisp/erc/erc-speedbar.el (erc-speedbar-expand-user): (erc-speedbar-expand-channel, erc-speedbar-expand-server) * lisp/erc/erc.el (erc-is-message-ctcp-and-not-action-p) (erc-banlist-update): * lisp/eshell/em-dirs.el (eshell-parse-drive-letter, eshell/pwd): * lisp/find-dired.el (find-dired): * lisp/frame.el (frame-set-background-mode): * lisp/generic-x.el (apache-log-generic-mode): * lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp): * lisp/gnus/gnus.el (gnus-short-group-name): * lisp/gnus/message.el (message-mailer-swallows-blank-line): * lisp/ibuffer.el (ibuffer-fontification-alist): * lisp/ido.el (ido-set-matches-1): * lisp/info-xref.el (info-xref-lock-file-p): * lisp/info.el (Info-dir-remove-duplicates) (Info-unescape-quotes, Info-split-parameter-string) (Info-speedbar-expand-node): * lisp/international/mule.el (sgml-html-meta-auto-coding-function): * lisp/isearch.el (isearch-pre-command-hook): * lisp/language/ethio-util.el (ethio-fidel-to-tex-buffer): * lisp/mail/rmail.el (rmail-collect-deleted): * lisp/mh-e/mh-alias.el (mh-alias-suggest-alias): * lisp/mh-e/mh-comp.el (mh-forward): * lisp/mh-e/mh-search.el (mh-index-next-folder) (mh-index-create-imenu-index): * lisp/mh-e/mh-xface.el (mh-picon-get-image): * lisp/minibuffer.el (completion--embedded-envvar-re): * lisp/net/ange-ftp.el (ange-ftp-ls-parser): * lisp/net/goto-addr.el (goto-address-mail-regexp) (goto-address-find-address-at-point): * lisp/net/pop3.el (pop3-read-response, pop3-user) (pop3-pass, pop3-apop): * lisp/net/tramp.el (tramp-ipv6-regexp) (tramp-replace-environment-variables): * lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set): * lisp/nxml/rng-uri.el (rng-uri-escape-multibyte): * lisp/nxml/rng-xsd.el (rng-xsd-convert-any-uri): * lisp/obsolete/pgg.el (pgg-fetch-key): * lisp/obsolete/vip.el (vip-get-ex-token): * lisp/org/ob-core.el (org-babel-string-read): * lisp/org/org-agenda.el: (org-agenda-add-entry-to-org-agenda-diary-file): * lisp/org/org-element.el (org-element-keyword-parser): * lisp/org/org-list.el (org-list-indent-item-generic): * lisp/org/org-mhe.el (org-mhe-get-message-folder-from-index): * lisp/org/org-mobile.el (org-mobile-apply): * lisp/org/org-mouse.el (org-mouse-context-menu): * lisp/org/org-plot.el (org-plot/gnuplot): * lisp/org/org-protocol.el (org-protocol-flatten-greedy): * lisp/org/org-table.el (org-table-copy-down) (org-table-formula-make-cmp-string) (org-table-get-stored-formulas, org-table-recalculate) (org-table-edit-formulas): * lisp/org/org.el (org-translate-link-from-planner) (org-fill-line-break-nobreak-p): * lisp/org/ox-ascii.el (org-ascii-item): * lisp/org/ox-latex.el (org-latex-clean-invalid-line-breaks): * lisp/org/ox.el (org-export-expand-include-keyword): * lisp/progmodes/ada-xref.el (ada-treat-cmd-string): * lisp/progmodes/cfengine.el (cfengine2-font-lock-keywords): * lisp/progmodes/cperl-mode.el (cperl-to-comment-or-eol) (cperl-find-pods-heres, cperl-fix-line-spacing) (cperl-have-help-regexp, cperl-word-at-point-hard) (cperl-make-regexp-x): * lisp/progmodes/dcl-mode.el (dcl-option-value-offset): * lisp/progmodes/etags.el (tag-implicit-name-match-p): * lisp/progmodes/fortran.el (fortran-fill): * lisp/progmodes/gdb-mi.el (gdb-speedbar-expand-node) (gdb-locals-handler-custom): * lisp/progmodes/grep.el (grep-mode-font-lock-keywords): * lisp/progmodes/gud.el (gud-jdb-find-source-using-classpath): * lisp/progmodes/js.el (js--continued-expression-p): * lisp/progmodes/m4-mode.el (m4-font-lock-keywords): * lisp/progmodes/meta-mode.el (meta-indent-level-count): * lisp/progmodes/mixal-mode.el (mixal-font-lock-keywords): * lisp/progmodes/opascal.el (opascal-find-unit-in-directory): * lisp/progmodes/pascal.el (pascal-progbeg-re): * lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re) (ruby-expr-beg, ruby-parse-partial) (ruby-toggle-string-quotes, ruby-font-lock-keywords): * lisp/progmodes/sql.el (sql--make-help-docstring): * lisp/progmodes/verilog-mode.el (verilog-coverpoint-re) (verilog-skip-forward-comment-p) (verilog-read-sub-decls-gate) (verilog-read-auto-template-middle): * lisp/progmodes/vhdl-mode.el (vhdl-resolve-env-variable) (vhdl-speedbar-expand-project, vhdl-speedbar-expand-entity) (vhdl-speedbar-expand-architecture) (vhdl-speedbar-expand-config, vhdl-speedbar-expand-package) (vhdl-speedbar-dired): * lisp/speedbar.el (speedbar-dired, speedbar-tag-file) (speedbar-tag-expand): * lisp/textmodes/dns-mode.el (dns-mode-font-lock-keywords): * lisp/textmodes/flyspell.el (flyspell-debug-signal-word-checked): * lisp/textmodes/ispell.el (ispell-process-line): * lisp/textmodes/reftex-cite.el (reftex-end-of-bib-entry): * lisp/textmodes/reftex-ref.el (reftex-replace-prefix-escapes): * lisp/url/url-parse.el (url-generic-parse-url): * lisp/url/url-util.el (url-truncate-url-for-viewing): * lisp/vc/diff-mode.el (diff-unified->context): * lisp/vc/vc-bzr.el (vc-bzr-error-regexp-alist): * lisp/vc/vc-cvs.el (vc-cvs-parse-status): * lisp/woman.el (woman0-el, woman-if-ignore) (woman-change-fonts): * lisp/xdg.el (xdg--substitute-home-env): Fix regular-expression infelicities and typos. Fix regular expression typos Fix typos reported by Mattias Engdegård in: that occurred in preloaded modules. * lisp/frame.el (frame-set-background-mode): * lisp/international/mule.el (sgml-html-meta-auto-coding-function): * lisp/isearch.el (isearch-pre-command-hook): * lisp/minibuffer.el (completion--embedded-envvar-re):
323 lines
12 KiB
EmacsLisp
323 lines
12 KiB
EmacsLisp
;;; xdg.el --- XDG specification and standard support -*- lexical-binding: t -*-
|
||
|
||
;; Copyright (C) 2017-2019 Free Software Foundation, Inc.
|
||
|
||
;; Author: Mark Oteiza <mvoteiza@udel.edu>
|
||
;; Created: 27 January 2017
|
||
;; Keywords: files, data
|
||
|
||
;; This file is part of GNU Emacs.
|
||
|
||
;; GNU Emacs is free software; you can redistribute it and/or modify
|
||
;; it under the terms of the GNU General Public License as published
|
||
;; by the Free Software Foundation; either version 3 of the License,
|
||
;; or (at your option) any later version.
|
||
|
||
;; GNU Emacs is distributed in the hope that it will be useful, but
|
||
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
;; General Public License for more details.
|
||
|
||
;; You should have received a copy of the GNU General Public License
|
||
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
||
|
||
;;; Commentary:
|
||
|
||
;; Library providing some convenience functions for the following XDG
|
||
;; standards and specifications
|
||
;;
|
||
;; - XDG Base Directory Specification
|
||
;; - Thumbnail Managing Standard
|
||
;; - xdg-user-dirs configuration
|
||
;; - Desktop Entry Specification
|
||
|
||
;;; Code:
|
||
|
||
(eval-when-compile
|
||
(require 'cl-lib)
|
||
(require 'subr-x))
|
||
|
||
|
||
;; XDG Base Directory Specification
|
||
;; https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
||
|
||
(defmacro xdg--dir-home (environ default-path)
|
||
(declare (debug (stringp stringp)))
|
||
(let ((env (make-symbol "env")))
|
||
`(let ((,env (getenv ,environ)))
|
||
(if (or (null ,env) (not (file-name-absolute-p ,env)))
|
||
(expand-file-name ,default-path)
|
||
,env))))
|
||
|
||
(defun xdg-config-home ()
|
||
"Return the base directory for user specific configuration files."
|
||
(xdg--dir-home "XDG_CONFIG_HOME" "~/.config"))
|
||
|
||
(defun xdg-cache-home ()
|
||
"Return the base directory for user specific cache files."
|
||
(xdg--dir-home "XDG_CACHE_HOME" "~/.cache"))
|
||
|
||
(defun xdg-data-home ()
|
||
"Return the base directory for user specific data files."
|
||
(xdg--dir-home "XDG_DATA_HOME" "~/.local/share"))
|
||
|
||
(defun xdg-runtime-dir ()
|
||
"Return the value of $XDG_RUNTIME_DIR."
|
||
(getenv "XDG_RUNTIME_DIR"))
|
||
|
||
(defun xdg-config-dirs ()
|
||
"Return the config directory search path as a list."
|
||
(let ((env (getenv "XDG_CONFIG_DIRS")))
|
||
(if (or (null env) (string= env ""))
|
||
'("/etc/xdg")
|
||
(parse-colon-path env))))
|
||
|
||
(defun xdg-data-dirs ()
|
||
"Return the data directory search path as a list."
|
||
(let ((env (getenv "XDG_DATA_DIRS")))
|
||
(if (or (null env) (string= env ""))
|
||
'("/usr/local/share/" "/usr/share/")
|
||
(parse-colon-path env))))
|
||
|
||
|
||
;; Thumbnail Managing Standard
|
||
;; https://specifications.freedesktop.org/thumbnail-spec/thumbnail-spec-latest.html
|
||
|
||
(defun xdg-thumb-uri (filename)
|
||
"Return the canonical URI for FILENAME.
|
||
If FILENAME has absolute file name /foo/bar.jpg, its canonical URI is
|
||
file:///foo/bar.jpg"
|
||
(concat "file://" (expand-file-name filename)))
|
||
|
||
(defun xdg-thumb-name (filename)
|
||
"Return the appropriate thumbnail filename for FILENAME."
|
||
(concat (md5 (xdg-thumb-uri filename)) ".png"))
|
||
|
||
(defun xdg-thumb-mtime (filename)
|
||
"Return modification time of FILENAME as an Emacs timestamp."
|
||
(file-attribute-modification-time (file-attributes filename)))
|
||
|
||
|
||
;; XDG User Directories
|
||
;; https://www.freedesktop.org/wiki/Software/xdg-user-dirs/
|
||
|
||
(defconst xdg-line-regexp
|
||
(eval-when-compile
|
||
(rx "XDG_"
|
||
(group-n 1 (or "DESKTOP" "DOWNLOAD" "TEMPLATES" "PUBLICSHARE"
|
||
"DOCUMENTS" "MUSIC" "PICTURES" "VIDEOS"))
|
||
"_DIR=\""
|
||
(group-n 2 (or "/" "$HOME/") (*? (or (not (any "\"")) "\\\"")))
|
||
"\""))
|
||
"Regexp matching non-comment lines in xdg-user-dirs config files.")
|
||
|
||
(defvar xdg-user-dirs nil
|
||
"Alist of directory keys and values.")
|
||
|
||
(defun xdg--substitute-home-env (str)
|
||
(if (file-name-absolute-p str) str
|
||
(save-match-data
|
||
(and (string-match "^\\$HOME/" str)
|
||
(replace-match "~/" t nil str 0)))))
|
||
|
||
(defun xdg--user-dirs-parse-line ()
|
||
"Return pair of user-dirs key to directory value in LINE, otherwise nil.
|
||
This should be called at the beginning of a line."
|
||
(skip-chars-forward "[:blank:]")
|
||
(when (and (/= (following-char) ?#)
|
||
(looking-at xdg-line-regexp))
|
||
(let ((k (match-string 1))
|
||
(v (match-string 2)))
|
||
(when (and k v) (cons k (xdg--substitute-home-env v))))))
|
||
|
||
(defun xdg--user-dirs-parse-file (filename)
|
||
"Return alist of xdg-user-dirs from FILENAME."
|
||
(let (elt res)
|
||
(when (file-readable-p filename)
|
||
(with-temp-buffer
|
||
(insert-file-contents filename)
|
||
(goto-char (point-min))
|
||
(while (not (eobp))
|
||
(setq elt (xdg--user-dirs-parse-line))
|
||
(when (consp elt) (push elt res))
|
||
(forward-line))))
|
||
res))
|
||
|
||
(defun xdg-user-dir (name)
|
||
"Return the directory referred to by NAME."
|
||
(when (null xdg-user-dirs)
|
||
(setq xdg-user-dirs
|
||
(xdg--user-dirs-parse-file
|
||
(expand-file-name "user-dirs.dirs" (xdg-config-home)))))
|
||
(let ((dir (cdr (assoc name xdg-user-dirs))))
|
||
(when dir (expand-file-name dir))))
|
||
|
||
|
||
;; Desktop Entry Specification
|
||
;; https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html
|
||
|
||
(defconst xdg-desktop-group-regexp
|
||
(rx "[" (group-n 1 (+? (in " -Z\\^-~"))) "]")
|
||
"Regexp matching desktop file group header names.")
|
||
|
||
;; TODO Localized strings left out intentionally, as Emacs has no
|
||
;; notion of l10n/i18n
|
||
(defconst xdg-desktop-entry-regexp
|
||
(rx (group-n 1 (+ (in "A-Za-z0-9-")))
|
||
;; (? "[" (group-n 3 (+ nonl)) "]")
|
||
(* blank) "=" (* blank)
|
||
(group-n 2 (* nonl)))
|
||
"Regexp matching desktop file entry key-value pairs.")
|
||
|
||
(defun xdg-desktop-read-group ()
|
||
"Return hash table of group of desktop entries in the current buffer."
|
||
(let ((res (make-hash-table :test #'equal)))
|
||
(while (not (or (eobp) (looking-at xdg-desktop-group-regexp)))
|
||
(skip-chars-forward "[:blank:]")
|
||
(cond
|
||
((eolp))
|
||
((= (following-char) ?#))
|
||
((looking-at xdg-desktop-entry-regexp)
|
||
(puthash (match-string 1) (match-string 2) res))
|
||
;; Filter localized strings
|
||
((looking-at (rx (group-n 1 (+ (in alnum "-"))) (* blank) "[")))
|
||
(t (error "Malformed line: %s"
|
||
(buffer-substring (point) (point-at-eol)))))
|
||
(forward-line))
|
||
res))
|
||
|
||
(defun xdg-desktop-read-file (filename &optional group)
|
||
"Return group contents of desktop file FILENAME as a hash table.
|
||
Optional argument GROUP defaults to the string \"Desktop Entry\"."
|
||
(with-temp-buffer
|
||
(insert-file-contents-literally filename)
|
||
(goto-char (point-min))
|
||
(while (and (skip-chars-forward "[:blank:]" (line-end-position))
|
||
(or (eolp) (= (following-char) ?#)))
|
||
(forward-line))
|
||
(unless (looking-at xdg-desktop-group-regexp)
|
||
(error "Expected group name! Instead saw: %s"
|
||
(buffer-substring (point) (point-at-eol))))
|
||
(when group
|
||
(while (and (re-search-forward xdg-desktop-group-regexp nil t)
|
||
(not (equal (match-string 1) group)))))
|
||
(forward-line)
|
||
(xdg-desktop-read-group)))
|
||
|
||
(defun xdg-desktop-strings (value)
|
||
"Partition VALUE into elements delimited by unescaped semicolons."
|
||
(let (res)
|
||
(setq value (string-trim-left value))
|
||
(dolist (x (split-string (replace-regexp-in-string "\\\\;" "\0" value) ";"))
|
||
(push (replace-regexp-in-string "\0" ";" x) res))
|
||
(when (null (string-match-p "[^[:blank:]]" (car res))) (pop res))
|
||
(nreverse res)))
|
||
|
||
|
||
;; MIME apps specification
|
||
;; https://standards.freedesktop.org/mime-apps-spec/mime-apps-spec-1.0.1.html
|
||
|
||
(defvar xdg-mime-table nil
|
||
"Table of MIME type to desktop file associations.
|
||
The table is an alist with keys being MIME major types (\"application\",
|
||
\"audio\", etc.), and values being hash tables. Each hash table has
|
||
MIME subtypes as keys and lists of desktop file absolute filenames.")
|
||
|
||
(defun xdg-mime-apps-files ()
|
||
"Return a list of files containing MIME/Desktop associations.
|
||
The list is in order of descending priority: user config, then
|
||
admin config, and finally system cached associations."
|
||
(let ((xdg-data-dirs (xdg-data-dirs))
|
||
(desktop (getenv "XDG_CURRENT_DESKTOP"))
|
||
res)
|
||
(when desktop
|
||
(setq desktop (format "%s-mimeapps.list" desktop)))
|
||
(dolist (name (cons "mimeapps.list" desktop))
|
||
(push (expand-file-name name (xdg-config-home)) res)
|
||
(push (expand-file-name (format "applications/%s" name) (xdg-data-home))
|
||
res)
|
||
(dolist (dir (xdg-config-dirs))
|
||
(push (expand-file-name name dir) res))
|
||
(dolist (dir xdg-data-dirs)
|
||
(push (expand-file-name (format "applications/%s" name) dir) res)))
|
||
(dolist (dir xdg-data-dirs)
|
||
(push (expand-file-name "applications/mimeinfo.cache" dir) res))
|
||
(nreverse res)))
|
||
|
||
(defun xdg-mime-collect-associations (mime files)
|
||
"Return a list of desktop file names associated with MIME.
|
||
The associations are searched in the list of file names FILES,
|
||
which is expected to be ordered by priority as in
|
||
`xdg-mime-apps-files'."
|
||
(let ((regexp (concat (regexp-quote mime) "=\\([^[:cntrl:]]*\\)$"))
|
||
res sec defaults added removed cached)
|
||
(with-temp-buffer
|
||
(dolist (f (reverse files))
|
||
(when (file-readable-p f)
|
||
(insert-file-contents-literally f nil nil nil t)
|
||
(goto-char (point-min))
|
||
(let (end)
|
||
(while (not (or (eobp) end))
|
||
(if (= (following-char) ?\[)
|
||
(progn (setq sec (char-after (1+ (point))))
|
||
(forward-line))
|
||
(if (not (looking-at regexp))
|
||
(forward-line)
|
||
(dolist (str (xdg-desktop-strings (match-string 1)))
|
||
(cl-pushnew str
|
||
(cond ((eq sec ?D) defaults)
|
||
((eq sec ?A) added)
|
||
((eq sec ?R) removed)
|
||
((eq sec ?M) cached))
|
||
:test #'equal))
|
||
(while (and (zerop (forward-line))
|
||
(/= (following-char) ?\[)))))))
|
||
;; Accumulate results into res
|
||
(dolist (f cached)
|
||
(when (not (member f removed)) (cl-pushnew f res :test #'equal)))
|
||
(dolist (f added)
|
||
(when (not (member f removed)) (push f res)))
|
||
(dolist (f removed)
|
||
(setq res (delete f res)))
|
||
(dolist (f defaults)
|
||
(push f res))
|
||
(setq defaults nil added nil removed nil cached nil))))
|
||
(delete-dups res)))
|
||
|
||
(defun xdg-mime-apps (mime)
|
||
"Return list of desktop files associated with MIME, otherwise nil.
|
||
The list is in order of descending priority, and each element is
|
||
an absolute file name of a readable file.
|
||
Results are cached in `xdg-mime-table'."
|
||
(pcase-let ((`(,type ,subtype) (split-string mime "/"))
|
||
(xdg-data-dirs (xdg-data-dirs))
|
||
(caches (xdg-mime-apps-files))
|
||
(files ()))
|
||
(let ((mtim1 (get 'xdg-mime-table 'mtime))
|
||
(mtim2 (cl-loop for f in caches when (file-readable-p f)
|
||
maximize (float-time
|
||
(file-attribute-modification-time
|
||
(file-attributes f))))))
|
||
;; If one of the MIME/Desktop cache files has been modified:
|
||
(when (or (null mtim1) (time-less-p mtim1 mtim2))
|
||
(setq xdg-mime-table nil)))
|
||
(when (null (assoc type xdg-mime-table))
|
||
(push (cons type (make-hash-table :test #'equal)) xdg-mime-table))
|
||
(if (let ((def (make-symbol "def"))
|
||
(table (cdr (assoc type xdg-mime-table))))
|
||
(not (eq (setq files (gethash subtype table def)) def)))
|
||
files
|
||
(and files (setq files nil))
|
||
(let ((dirs (mapcar (lambda (dir) (expand-file-name "applications" dir))
|
||
(cons (xdg-data-home) xdg-data-dirs))))
|
||
;; Not being particular about desktop IDs
|
||
(dolist (f (nreverse (xdg-mime-collect-associations mime caches)))
|
||
(push (locate-file f dirs) files))
|
||
(when files
|
||
(put 'xdg-mime-table 'mtime (current-time)))
|
||
(puthash subtype (delq nil files) (cdr (assoc type xdg-mime-table)))))))
|
||
|
||
(provide 'xdg)
|
||
|
||
;;; xdg.el ends here
|