mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-21 21:20:44 -08:00
Instead of restyling curved quotes for every call to ‘format’, create a new function ‘format-message’ that does the restyling, and using the new function instead of ‘format’ only in contexts where this seems appropriate. Problem reported by Dmitry Gutov and Andreas Schwab in: http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00826.html http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00827.html * doc/lispref/commands.texi (Using Interactive): * doc/lispref/control.texi (Signaling Errors, Signaling Errors): * doc/lispref/display.texi (Displaying Messages, Progress): * doc/lispref/elisp.texi: * doc/lispref/help.texi (Keys in Documentation): * doc/lispref/minibuf.texi (Minibuffer Misc): * doc/lispref/strings.texi (Formatting Strings): * etc/NEWS: Document the changes. * lisp/abbrev.el (expand-region-abbrevs): * lisp/apropos.el (apropos-library): * lisp/calc/calc-ext.el (calc-record-message) (calc-user-function-list): * lisp/calc/calc-help.el (calc-describe-key, calc-full-help): * lisp/calc/calc-lang.el (math-read-big-balance): * lisp/calc/calc-store.el (calc-edit-variable): * lisp/calc/calc-units.el (math-build-units-table-buffer): * lisp/calc/calc-yank.el (calc-edit-mode): * lisp/calendar/icalendar.el (icalendar-export-region) (icalendar--add-diary-entry): * lisp/cedet/mode-local.el (mode-local-print-binding) (mode-local-describe-bindings-2): * lisp/cedet/semantic/complete.el (semantic-completion-message): * lisp/cedet/semantic/edit.el (semantic-parse-changes-failed): * lisp/cedet/semantic/wisent/comp.el (wisent-log): * lisp/cedet/srecode/insert.el (srecode-insert-show-error-report): * lisp/descr-text.el (describe-text-properties-1, describe-char): * lisp/dframe.el (dframe-message): * lisp/dired-aux.el (dired-query): * lisp/emacs-lisp/byte-opt.el (byte-compile-log-lap-1): * lisp/emacs-lisp/bytecomp.el (byte-compile-log) (byte-compile-log-file, byte-compile-warn, byte-compile-form): * lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use) (cconv-analyze-form): * lisp/emacs-lisp/check-declare.el (check-declare-warn): * lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet): * lisp/emacs-lisp/edebug.el (edebug-format): * lisp/emacs-lisp/eieio-core.el (eieio-oref): * lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message) (eldoc-message): * lisp/emacs-lisp/elint.el (elint-file, elint-log): * lisp/emacs-lisp/find-func.el (find-function-library): * lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning): * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): * lisp/emacs-lisp/nadvice.el (advice--make-docstring): * lisp/emacs-lisp/package.el (package-compute-transaction) (package-install-button-action, package-delete-button-action) (package-menu--list-to-prompt): * lisp/emacs-lisp/timer.el (timer-event-handler): * lisp/emacs-lisp/warnings.el (lwarn, warn): * lisp/emulation/viper-cmd.el: (viper-toggle-parse-sexp-ignore-comments) (viper-kill-buffer, viper-brac-function): * lisp/emulation/viper-macs.el (viper-record-kbd-macro): * lisp/facemenu.el (facemenu-add-new-face): * lisp/faces.el (face-documentation, read-face-name) (face-read-string, read-face-font, describe-face): * lisp/files.el (find-alternate-file, hack-local-variables) (hack-one-local-variable--obsolete, write-file) (basic-save-buffer, delete-directory): * lisp/format.el (format-write-file, format-find-file) (format-insert-file): * lisp/help-fns.el (help-fns--key-bindings) (help-fns--compiler-macro, help-fns--obsolete) (help-fns--interactive-only, describe-function-1) (describe-variable): * lisp/help.el (describe-mode): * lisp/info-xref.el (info-xref-output): * lisp/info.el (Info-virtual-index-find-node) (Info-virtual-index, info-apropos): * lisp/international/kkc.el (kkc-error): * lisp/international/mule-cmds.el: (select-safe-coding-system-interactively) (select-safe-coding-system, describe-input-method): * lisp/international/mule-conf.el (code-offset): * lisp/international/mule-diag.el (describe-character-set) (list-input-methods-1): * lisp/international/quail.el (quail-error): * lisp/minibuffer.el (minibuffer-message): * lisp/mpc.el (mpc--debug): * lisp/msb.el (msb--choose-menu): * lisp/net/ange-ftp.el (ange-ftp-message): * lisp/net/gnutls.el (gnutls-message-maybe): * lisp/net/newst-backend.el (newsticker--sentinel-work): * lisp/net/newst-treeview.el (newsticker--treeview-load): * lisp/net/nsm.el (nsm-query-user): * lisp/net/rlogin.el (rlogin): * lisp/net/soap-client.el (soap-warning): * lisp/net/tramp.el (tramp-debug-message): * lisp/nxml/nxml-outln.el (nxml-report-outline-error): * lisp/nxml/nxml-parse.el (nxml-parse-error): * lisp/nxml/rng-cmpct.el (rng-c-error): * lisp/nxml/rng-match.el (rng-compile-error): * lisp/nxml/rng-uri.el (rng-uri-error): * lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer): * lisp/org/org-ctags.el: (org-ctags-ask-rebuild-tags-file-then-find-tag): * lisp/proced.el (proced-log): * lisp/progmodes/ebnf2ps.el (ebnf-log): * lisp/progmodes/flymake.el (flymake-log): * lisp/progmodes/vhdl-mode.el (vhdl-warning-when-idle): * lisp/replace.el (occur-1): * lisp/simple.el (execute-extended-command) (undo-outer-limit-truncate, define-alternatives): * lisp/startup.el (command-line): * lisp/subr.el (error, user-error, add-to-list): * lisp/tutorial.el (tutorial--describe-nonstandard-key) (tutorial--find-changed-keys): * src/callint.c (Fcall_interactively): * src/editfns.c (Fmessage, Fmessage_box): Restyle the quotes of format strings intended for use as a diagnostic, when restyling seems appropriate. * lisp/subr.el (format-message): New function. * src/doc.c (Finternal__text_restyle): New function. (syms_of_doc): Define it.
354 lines
10 KiB
EmacsLisp
354 lines
10 KiB
EmacsLisp
;;; rng-uri.el --- URI parsing and manipulation
|
|
|
|
;; Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
|
|
|
|
;; Author: James Clark
|
|
;; Keywords: wp, hypermedia, languages, XML
|
|
|
|
;; 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 <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(defun rng-file-name-uri (f)
|
|
"Return a URI for the filename F.
|
|
Multibyte characters are left as is. Use `rng-uri-escape-multibyte' to
|
|
escape them using %HH."
|
|
(setq f (expand-file-name f))
|
|
(let ((url
|
|
(replace-regexp-in-string "[\000-\032\177<>#%\"{}|\\^[]`%?;]"
|
|
'rng-percent-encode
|
|
f)))
|
|
(concat "file:"
|
|
(if (and (> (length url) 0)
|
|
(= (aref url 0) ?/))
|
|
"//"
|
|
"///")
|
|
url)))
|
|
|
|
(defun rng-uri-escape-multibyte (uri)
|
|
"Escape multibyte characters in URI."
|
|
(replace-regexp-in-string "[:nonascii:]"
|
|
'rng-percent-encode
|
|
(encode-coding-string uri 'utf-8)))
|
|
|
|
(defun rng-percent-encode (str)
|
|
(apply 'concat
|
|
(mapcar (lambda (ch)
|
|
(format "%%%x%x" (/ ch 16) (% ch 16)))
|
|
(string-to-list str))))
|
|
|
|
|
|
(defun rng-uri-file-name (uri)
|
|
"Return the filename represented by a URI.
|
|
Signal an error if URI is not a valid file URL."
|
|
(rng-uri-file-name-1 uri nil))
|
|
|
|
(defun rng-uri-pattern-file-name-regexp (pattern)
|
|
"Return a regexp for filenames represented by URIs that match PATTERN."
|
|
(rng-uri-file-name-1 pattern 'match))
|
|
|
|
(defun rng-uri-pattern-file-name-replace-match (pattern)
|
|
(rng-uri-file-name-1 pattern 'replace))
|
|
|
|
;; pattern is either nil or match or replace
|
|
(defun rng-uri-file-name-1 (uri pattern)
|
|
(unless (string-match "\\`\\(?:[^%]\\|%[0-9a-fA-F]{2}\\)*\\'" uri)
|
|
(rng-uri-error "Bad escapes in URI `%s'" uri))
|
|
(setq uri (rng-uri-unescape-multibyte uri))
|
|
(let* ((components
|
|
(or (rng-uri-split uri)
|
|
(rng-uri-error "Cannot split URI `%s' into its components" uri)))
|
|
(scheme (nth 0 components))
|
|
(authority (nth 1 components))
|
|
(path (nth 2 components))
|
|
(absolutep (string-match "\\`/" path))
|
|
(query (nth 3 components))
|
|
(fragment-id (nth 4 components)))
|
|
(cond ((not scheme)
|
|
(unless pattern
|
|
(rng-uri-error "URI `%s' does not have a scheme" uri)))
|
|
((not (string= (downcase scheme) "file"))
|
|
(rng-uri-error "URI `%s' does not use the `file:' scheme" uri)))
|
|
(when (not (member authority
|
|
(cons (system-name) '(nil "" "localhost"))))
|
|
(rng-uri-error "URI `%s' does not start with `file:///' or `file://localhost/'"
|
|
uri))
|
|
(when query
|
|
(rng-uri-error "`?' not escaped in file URI `%s'" uri))
|
|
(when fragment-id
|
|
(rng-uri-error "URI `%s' has a fragment identifier" uri))
|
|
(when (string-match ";" path)
|
|
(rng-uri-error "`;' not escaped in URI `%s'" uri))
|
|
(when (string-match "%2[fF]" path) ;; 2f is hex code of slash
|
|
(rng-uri-error "Escaped slash in URI `%s'" uri))
|
|
(when (and (eq system-type 'windows-nt)
|
|
absolutep
|
|
(file-name-absolute-p (substring path 1)))
|
|
(setq path (substring path 1)))
|
|
(when (and pattern (string-match "\\`\\./" path))
|
|
(setq path (substring path 2)))
|
|
(setq path
|
|
(cond ((eq pattern 'match)
|
|
(rng-uri-unescape-unibyte-match path))
|
|
((eq pattern 'replace)
|
|
(rng-uri-unescape-unibyte-replace path 2))
|
|
(t
|
|
(rng-uri-unescape-unibyte path))))
|
|
(when (string-match "\000" path)
|
|
(rng-uri-error "URI `%s' has NUL character in path" uri))
|
|
(when (eq pattern 'match)
|
|
(setq path
|
|
(concat (if absolutep
|
|
"\\(\\)"
|
|
"\\(\\(?:[^/]*/\\)*\\)")
|
|
path)))
|
|
(cond ((eq pattern 'match)
|
|
(concat "\\`" path "\\'"))
|
|
((and (eq pattern 'replace)
|
|
(not absolutep))
|
|
(concat "\\1" path))
|
|
(t path))))
|
|
|
|
(defun rng-uri-error (&rest args)
|
|
(signal 'rng-uri-error (list (apply #'format-message args))))
|
|
|
|
(define-error 'rng-uri-error "Invalid URI")
|
|
|
|
(defun rng-uri-split (str)
|
|
(and (string-match "\\`\\(?:\\([^:/?#]+\\):\\)?\
|
|
\\(?://\\([^/?#]*\\)\\)?\
|
|
\\([^?#]*\\)\
|
|
\\(?:\\?\\([^#]*\\)\\)?\
|
|
\\(?:#\\(\\(?:.\\|\n\\)*\\)\\)?\\'"
|
|
str)
|
|
(list (match-string 1 str)
|
|
(match-string 2 str)
|
|
(match-string 3 str)
|
|
(match-string 4 str)
|
|
(match-string 5 str))))
|
|
|
|
(defun rng-uri-join (scheme authority path &optional query fragment-id)
|
|
(when path
|
|
(let (parts)
|
|
(when fragment-id
|
|
(setq parts (list "#" fragment-id)))
|
|
(when query
|
|
(setq parts
|
|
(cons "?"
|
|
(cons query parts))))
|
|
(setq parts (cons path parts))
|
|
(when authority
|
|
(setq parts
|
|
(cons "//"
|
|
(cons authority parts))))
|
|
(when scheme
|
|
(setq parts
|
|
(cons scheme
|
|
(cons ":" parts))))
|
|
(apply 'concat parts))))
|
|
|
|
(defun rng-uri-resolve (uri-ref base-uri)
|
|
"Resolve a possibly relative URI reference into absolute form.
|
|
URI-REF is the URI reference to be resolved.
|
|
BASE-URI is the base URI to use for resolving it.
|
|
The algorithm is specified by RFC 2396.
|
|
If there is some problem with URI-REF or BASE-URI, then
|
|
URI-REF will be returned."
|
|
(let* ((components (rng-uri-split uri-ref))
|
|
(scheme (nth 0 components))
|
|
(authority (nth 1 components))
|
|
(path (nth 2 components))
|
|
(query (nth 3 components))
|
|
(fragment-id (nth 4 components))
|
|
(base-components (rng-uri-split base-uri)))
|
|
(if (or (not components)
|
|
scheme
|
|
(not base-components)
|
|
(not (nth 0 base-components)))
|
|
uri-ref
|
|
(setq scheme (nth 0 base-components))
|
|
(when (not authority)
|
|
(setq authority (nth 1 base-components))
|
|
(if (and (equal path "") (not query))
|
|
;; Handle same document reference by returning
|
|
;; same URI (RFC 2396bis does this too).
|
|
(setq path (nth 2 base-components)
|
|
query (nth 3 base-components))
|
|
(setq path (rng-resolve-path path (nth 2 base-components)))))
|
|
(rng-uri-join scheme
|
|
authority
|
|
path
|
|
query
|
|
fragment-id))))
|
|
|
|
;; See RFC 2396 5.2, steps 5 and 6
|
|
(defun rng-resolve-path (path base-path)
|
|
;; Step 5
|
|
(if (or (string-match "\\`/" path)
|
|
(not (string-match "\\`/" base-path)))
|
|
path
|
|
;; Step 6
|
|
;; (a), (b)
|
|
(let ((segments (rng-split-path path))
|
|
(base-segments (rng-split-path base-path)))
|
|
(if (> (length base-segments) 1)
|
|
(setq segments (nconc (nbutlast base-segments)
|
|
segments))
|
|
(setcar segments
|
|
(concat (car base-segments) (car segments))))
|
|
;; (d)
|
|
(let ((last-segment (last segments)))
|
|
(when (equal (car last-segment) ".")
|
|
(setcar last-segment "")))
|
|
;; (c)
|
|
(setq segments (delete "." segments))
|
|
;; (e)
|
|
(let (iter matched)
|
|
(while (progn
|
|
(setq matched nil)
|
|
(setq iter (cdr segments))
|
|
(while (and iter (not matched))
|
|
(if (or (not (equal (cadr iter) ".."))
|
|
(equal (car iter) ".."))
|
|
(setq iter (cdr iter))
|
|
(setcar iter nil)
|
|
(setcar (cdr iter)
|
|
;; (f)
|
|
(if (cddr iter) nil ""))
|
|
(setq matched t)
|
|
(setq segments (delq nil segments))))
|
|
matched)))
|
|
(rng-join-path segments))))
|
|
|
|
(defun rng-relative-uri (full base)
|
|
"Return a URI that relative to BASE is equivalent to FULL.
|
|
The returned URI will be relative if possible.
|
|
Both FULL and BASE must be absolute URIs."
|
|
(let* ((components (rng-uri-split full))
|
|
(scheme (nth 0 components))
|
|
(authority (nth 1 components))
|
|
(path (nth 2 components))
|
|
(query (nth 3 components))
|
|
(fragment-id (nth 4 components))
|
|
(base-components (rng-uri-split base)))
|
|
(if (and components
|
|
base-components
|
|
scheme
|
|
(equal scheme
|
|
(nth 0 base-components)))
|
|
(progn
|
|
(setq scheme nil)
|
|
(when (and authority
|
|
(equal authority
|
|
(nth 1 base-components)))
|
|
(setq authority nil)
|
|
(setq path (rng-relative-path path (nth 2 base-components))))
|
|
(rng-uri-join scheme authority path query fragment-id))
|
|
full)))
|
|
|
|
(defun rng-relative-path (path base-path)
|
|
(let ((segments (rng-split-path path))
|
|
(base-segments (rng-split-path base-path)))
|
|
(when (> (length base-segments) 1)
|
|
(setq base-segments (nbutlast base-segments)))
|
|
(if (or (member "." segments)
|
|
(member ".." segments)
|
|
(member "." base-segments)
|
|
(member ".." base-segments))
|
|
path
|
|
(while (and segments
|
|
base-segments
|
|
(string= (car segments)
|
|
(car base-segments)))
|
|
(setq segments (cdr segments))
|
|
(setq base-segments (cdr base-segments)))
|
|
(while base-segments
|
|
(setq base-segments (cdr base-segments))
|
|
(setq segments (cons ".." segments)))
|
|
(when (equal (car segments) "")
|
|
(setq segments (cons "." segments)))
|
|
(rng-join-path segments))))
|
|
|
|
(defun rng-split-path (path)
|
|
(let ((start 0)
|
|
segments)
|
|
(while (string-match "/" path start)
|
|
(setq segments (cons (substring path start (match-beginning 0))
|
|
segments))
|
|
(setq start (match-end 0)))
|
|
(nreverse (cons (substring path start) segments))))
|
|
|
|
(defun rng-join-path (segments)
|
|
(and segments
|
|
(mapconcat 'identity segments "/")))
|
|
|
|
(defun rng-uri-unescape-multibyte (str)
|
|
(replace-regexp-in-string "\\(?:%[89a-fA-F][0-9a-fA-F]\\)+"
|
|
'rng-multibyte-percent-decode
|
|
str))
|
|
|
|
(defun rng-multibyte-percent-decode (str)
|
|
(decode-coding-string (apply 'string
|
|
(mapcar (lambda (h) (string-to-number h 16))
|
|
(split-string str "%")))
|
|
'utf-8))
|
|
|
|
(defun rng-uri-unescape-unibyte (str)
|
|
(replace-regexp-in-string "%[0-7][0-9a-fA-F]"
|
|
(lambda (h)
|
|
(string-to-number (substring h 1) 16))
|
|
str
|
|
t
|
|
t))
|
|
|
|
(defun rng-uri-unescape-unibyte-match (str)
|
|
(replace-regexp-in-string "%[0-7][0-9a-fA-F]\\|[^%]"
|
|
(lambda (match)
|
|
(if (string= match "*")
|
|
"\\([^/]*\\)"
|
|
(regexp-quote
|
|
(if (= (length match) 1)
|
|
match
|
|
(string-to-number (substring match 1)
|
|
16)))))
|
|
str
|
|
t
|
|
t))
|
|
|
|
(defun rng-uri-unescape-unibyte-replace (str next-match-index)
|
|
(replace-regexp-in-string
|
|
"%[0-7][0-9a-fA-F]\\|[^%]"
|
|
(lambda (match)
|
|
(if (string= match "*")
|
|
(let ((n next-match-index))
|
|
(setq next-match-index (1+ n))
|
|
(format "\\%s" n))
|
|
(let ((ch (if (= (length match) 1)
|
|
(aref match 0)
|
|
(string-to-number (substring match 1)
|
|
16))))
|
|
(if (eq ch ?\\)
|
|
(string ?\\ ?\\)
|
|
(string ch)))))
|
|
str
|
|
t
|
|
t))
|
|
|
|
(provide 'rng-uri)
|
|
|
|
;;; rng-uri.el ends here
|