commit 30866274e21c5f0a1c5f60cfe290743e7d482349 (HEAD, refs/remotes/origin/master) Author: David Caldwell Date: Tue Sep 1 23:41:42 2015 -0400 * lisp/vc/vc-hooks.el (vc-refresh-state): New command (vc-refresh-state): Rename from vc-find-file-hook and make interactive. (vc-find-file-hook): Redefine as obsolete alias. Copyright-paperwork-exempt: yes diff --git a/etc/NEWS b/etc/NEWS index e50e7a7..c664e02 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -310,6 +310,7 @@ standards. * Changes in Specialized Modes and Packages in Emacs 25.1 +** You can recompute the VC state of a file buffer with `M-x vc-refresh-state' ** Prog mode has some support for multi-mode indentation. See `prog-indentation-context' and `prog-widen'. diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index bae9919..e674f0e 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -790,8 +790,9 @@ current, and kill the buffer that visits the link." (defun vc-default-find-file-hook (_backend) nil) -(defun vc-find-file-hook () - "Function for `find-file-hook' activating VC mode if appropriate." +(defun vc-refresh-state () + "Activate or deactivate VC mode as appropriate." + (interactive) ;; Recompute whether file is version controlled, ;; if user has killed the buffer and revisited. (when vc-mode @@ -838,18 +839,19 @@ current, and kill the buffer that visits the link." (vc-follow-link) (message "Followed link to %s" buffer-file-name) - (vc-find-file-hook)) + (vc-refresh-state)) (t (if (yes-or-no-p (format "Symbolic link to %s-controlled source file; follow link? " link-type)) (progn (vc-follow-link) (message "Followed link to %s" buffer-file-name) - (vc-find-file-hook)) + (vc-refresh-state)) (message "Warning: editing through the link bypasses version control") ))))))))) -(add-hook 'find-file-hook 'vc-find-file-hook) +(add-hook 'find-file-hook #'vc-refresh-state) +(define-obsolete-function-alias 'vc-find-file-hook 'vc-refresh-state "25.1") (defun vc-kill-buffer-hook () "Discard VC info about a file when we kill its buffer." commit 19532d147b431a4fe34f088d6de07891c48e2c5c Author: Paul Eggert Date: Tue Sep 1 18:21:42 2015 -0700 Escape ` and ' in doc Escape apostrophes and grave accents in docstrings if they are are supposed to stand for themselves and are not quotes. Remove apostrophes from docstring examples like ‘'(calendar-nth-named-day -1 0 10 year)’ that confuse source code with data. Do some other minor docstring fixups as well, e.g., insert a missing close quote. diff --git a/lisp/calculator.el b/lisp/calculator.el index 55229bc..49d47a0 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -191,7 +191,7 @@ Each element in this list is a list of a character and a number that will be stored in that character's register. For example, use this to define the golden ratio number: - (setq calculator-user-registers '((?g . 1.61803398875))) + (setq calculator-user-registers \\='((?g . 1.61803398875))) before you load calculator." :type '(repeat (cons character number)) :set (lambda (_ val) @@ -214,7 +214,7 @@ Examples: t as a prefix key: (setq calculator-user-operators - '((\"tf\" cl-to-fr (+ 32 (/ (* X 9) 5)) 1) + \\='((\"tf\" cl-to-fr (+ 32 (/ (* X 9) 5)) 1) (\"tc\" fr-to-cl (/ (* (- X 32) 5) 9) 1) (\"tp\" kg-to-lb (/ X 0.453592) 1) (\"tk\" lb-to-kg (* X 0.453592) 1) @@ -226,8 +226,8 @@ Examples: version of `X' and `F' for a recursive call. Here is a [very inefficient] Fibonacci number calculation: - (add-to-list 'calculator-user-operators - '(\"F\" fib + (add-to-list \\='calculator-user-operators + \\='(\"F\" fib (if (<= TX 1) 1 (+ (F (- TX 1)) (F (- TX 2)))))) Note that this will be either postfix or prefix, according to diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index e8d6077..a0d0def 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el @@ -82,7 +82,7 @@ list and for correcting times of day in the solar and lunar calculations. For example, if daylight saving time ends on the last Sunday in October: - '(calendar-nth-named-day -1 0 10 year) + (calendar-nth-named-day -1 0 10 year) If the locale never uses daylight saving time, set this to nil." :type 'sexp diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index c35bd38..07977af 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -550,12 +550,12 @@ For example, to display the ISO week numbers: (setq calendar-week-start-day 1 calendar-intermonth-text - '(propertize + \\='(propertize (format \"%2d\" (car (calendar-iso-from-absolute (calendar-absolute-from-gregorian (list month day year))))) - 'font-lock-face 'font-lock-function-name-face)) + \\='font-lock-face \\='font-lock-function-name-face)) See also `calendar-intermonth-header'." :group 'calendar diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index 225caa5..95d9d84 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -716,8 +716,8 @@ It might be useful to override this variable to add comment faces specific to a major mode. For example, in jde mode: \(defvar-mode-local jde-mode semantic-idle-summary-out-of-context-faces - (append (default-value 'semantic-idle-summary-out-of-context-faces) - '(jde-java-font-lock-doc-tag-face + (append (default-value \\='semantic-idle-summary-out-of-context-faces) + \\='(jde-java-font-lock-doc-tag-face jde-java-font-lock-link-face jde-java-font-lock-bold-face jde-java-font-lock-underline-face diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 7030833..08c1acd 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1189,8 +1189,8 @@ and `defface'. For example, the MH-E package updates this alist as follows: - (add-to-list 'customize-package-emacs-version-alist - '(MH-E (\"6.0\" . \"22.1\") (\"6.1\" . \"22.1\") + (add-to-list \\='customize-package-emacs-version-alist + \\='(MH-E (\"6.0\" . \"22.1\") (\"6.1\" . \"22.1\") (\"7.0\" . \"22.1\") (\"7.1\" . \"22.1\") (\"7.2\" . \"22.1\") (\"7.3\" . \"22.1\") (\"7.4\" . \"22.1\") (\"8.0\" . \"22.1\"))) diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index 38deeae..ba50680 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -568,7 +568,7 @@ may be bound to temporary variables which are introduced automatically to preserve proper execution order of the arguments. For example: - (defsetf nth (n x) (v) `(setcar (nthcdr ,n ,x) ,v)) + (defsetf nth (n x) (v) \\=`(setcar (nthcdr ,n ,x) ,v)) You can replace this form with `gv-define-setter'. diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 84c07d9..ad178c3 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -683,12 +683,12 @@ This class is not stored in the `parent' slot of a class vector." "Make a new instance of CLASS based on INITARGS. For example: - (make-instance 'foo) + (make-instance \\='foo) INITARGS is a property list with keywords based on the `:initarg' for each slot. For example: - (make-instance 'foo :slot1 value1 :slotN valueN)") + (make-instance \\='foo :slot1 value1 :slotN valueN)") (define-obsolete-function-alias 'constructor #'make-instance "25.1") diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index feffd54..2dae86e 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -337,8 +337,8 @@ and the face `eldoc-highlight-function-argument', if they are to have any effect. Major modes should modify this variable using `add-function', for example: - (add-function :before-until (local 'eldoc-documentation-function) - #'foo-mode-eldoc-function) + (add-function :before-until (local \\='eldoc-documentation-function) + #\\='foo-mode-eldoc-function) so that the global documentation function (i.e. the default value of the variable) is taken into account if the major mode specific function does not return any documentation.") diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index bed9024..6760982 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -218,7 +218,7 @@ return a Lisp form that does the assignment. The first arg in ARGLIST (the one that receives VAL) receives an expression which can do arbitrary things, whereas the other arguments are all guaranteed to be pure and copyable. Example use: - (gv-define-setter aref (v a i) `(aset ,a ,i ,v))" + (gv-define-setter aref (v a i) \\=`(aset ,a ,i ,v))" (declare (indent 2) (debug (&define name sexp body))) `(gv-define-expander ,name (lambda (do &rest args) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index db5f6a6..eec6925 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1082,7 +1082,7 @@ As an example: Would expand to: (prog2 - (defvar erc-server-311-functions 'erc-server-311 + (defvar erc-server-311-functions \\='erc-server-311 \"Some non-generic variable documentation. Hook called upon receiving a 311 server response. diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el index 9de9b25..441663f 100644 --- a/lisp/erc/erc-networks.el +++ b/lisp/erc/erc-networks.el @@ -782,9 +782,9 @@ PORTS should be a list of either: numbers between LOW and HIGH (inclusive) is returned. As an example: - (erc-ports-list '(1)) => (1) - (erc-ports-list '((1 5))) => (1 2 3 4 5) - (erc-ports-list '(1 (3 5))) => (1 3 4 5)" + (erc-ports-list \\='(1)) => (1) + (erc-ports-list \\='((1 5))) => (1 2 3 4 5) + (erc-ports-list \\='(1 (3 5))) => (1 3 4 5)" (let (result) (dolist (p ports) (cond ((numberp p) @@ -866,4 +866,3 @@ VALUE is the options value.") ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el index 07a4274..2d2fa62 100644 --- a/lisp/erc/erc-services.el +++ b/lisp/erc/erc-services.el @@ -172,7 +172,7 @@ You can also use M-x erc-nickserv-identify-mode to change modes." Example of use: (setq erc-nickserv-passwords - '((freenode ((\"nick-one\" . \"password\") + \\='((freenode ((\"nick-one\" . \"password\") (\"nick-two\" . \"password\"))) (DALnet ((\"nick\" . \"password\")))))" :group 'erc-services diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index f282179..726e9ed 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -927,7 +927,7 @@ If no elements match, then the empty string is used. As an example: (setq erc-quit-reason-various-alist - '((\"xmms\" dme:now-playing) + \\='((\"xmms\" dme:now-playing) (\"version\" erc-quit-reason-normal) (\"home\" \"Gone home !\") (\"^$\" \"Default Reason\"))) @@ -950,7 +950,7 @@ If no elements match, then the empty string is used. As an example: (setq erc-part-reason-various-alist - '((\"xmms\" dme:now-playing) + \\='((\"xmms\" dme:now-playing) (\"version\" erc-part-reason-normal) (\"home\" \"Gone home !\") (\"^$\" \"Default Reason\"))) diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index 2e929b0..4d28208 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -82,7 +82,7 @@ and `eshell-stringify-list'. For example, OPTIONS might look like: - '((?C nil nil multi-column \"multi-column display\") + ((?C nil nil multi-column \"multi-column display\") (nil \"help\" nil nil \"show this usage display\") (?r \"reverse\" nil reverse-list \"reverse order while sorting\") :external \"ls\" diff --git a/lisp/filesets.el b/lisp/filesets.el index 8e2b145..c098879 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -951,7 +951,7 @@ variable will take effect after rebuilding the menu. Caveat: Fileset names have to be unique. Example definition: - '\(\(\"My Wiki\" + \\='\(\(\"My Wiki\" \(:ingroup \"~/Etc/My-Wiki/WikiContents\")) \(\"My Homepage\" \(:pattern \"~/public_html/\" \"^.+\\\\.html$\") diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 5f12c6c..b74b603 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -683,9 +683,9 @@ end of the current highlighting list. For example: - (font-lock-add-keywords 'c-mode - '((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 'font-lock-warning-face prepend) - (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" . 'font-lock-keyword-face))) + (font-lock-add-keywords \\='c-mode + \\='((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 \\='font-lock-warning-face prepend) + (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" . \\='font-lock-keyword-face))) adds two fontification patterns for C mode, to fontify `FIXME:' words, even in comments, and to fontify `and', `or' and `not' words as keywords. diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index b4a2f6a..01eb6c5 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -330,7 +330,7 @@ to match a mail address in the From: header, BANNER is one of a symbol If ADDRESS matches author's mail address, it will remove things like advertisements. For example: -\((\"@yoo-hoo\\\\.co\\\\.jp\\\\'\" . \"\\n_+\\nDo You Yoo-hoo!\\\\?\\n.*\\n.*\\n\")) +\((\"@yoo-hoo\\\\.co\\\\.jp\\\\\\='\" . \"\\n_+\\nDo You Yoo-hoo!\\\\?\\n.*\\n.*\\n\")) " :type '(repeat (cons @@ -886,12 +886,12 @@ Here are examples: ;; Specify the altitude of Face images in the From header. \(setq gnus-face-properties-alist - '((pbm . (:face gnus-x-face :ascent 80)) + \\='((pbm . (:face gnus-x-face :ascent 80)) (png . (:ascent 80)))) ;; Show Face images as pressed buttons. \(setq gnus-face-properties-alist - '((pbm . (:face gnus-x-face :relief -2)) + \\='((pbm . (:face gnus-x-face :relief -2)) (png . (:relief -2)))) See the manual for the valid properties for various image types. diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 447bd5d..6b90204 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -1656,7 +1656,7 @@ while still allowing them to affect operations done in other buffers. For example: \(setq gnus-newsgroup-variables - '(message-use-followup-to + \\='(message-use-followup-to (gnus-visible-headers . \"^From:\\\\|^Newsgroups:\\\\|^Subject:\\\\|^Date:\\\\|^To:\"))) ") diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index 3134438..a6e75b7 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -151,15 +151,15 @@ maximum in the reminder is not that painful, I think. Although this scheme might appear somewhat weird at a first glance, it is very powerful. In order to make this clear, here are some examples: -- '(0 . day): this is the default value of `nndiary-reminders'. It means +- (0 . day): this is the default value of `nndiary-reminders'. It means pop up the appointments of the day each morning at 00:00. -- '(1 . day): this means pop up the appointments the day before, at 00:00. +- (1 . day): this means pop up the appointments the day before, at 00:00. -- '(6 . hour): for an appointment at 18:30, this would pop up the +- (6 . hour): for an appointment at 18:30, this would pop up the appointment message at 12:00. -- '(360 . minute): for an appointment at 18:30 and 15 seconds, this would +- (360 . minute): for an appointment at 18:30 and 15 seconds, this would pop up the appointment message at 12:30." :group 'nndiary :type '(repeat (cons :format "%v\n" diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 2292849..6811160 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -217,7 +217,7 @@ will try to match against both the From and the To header. Example: \(setq nnmail-fancy-expiry-targets - '((to-from \"boss\" \"nnfolder:Work\") + \\='((to-from \"boss\" \"nnfolder:Work\") (\"Subject\" \"IMPORTANT\" \"nnfolder:IMPORTANT.%Y.%b\") (\"from\" \".*\" \"nnfolder:Archive-%Y\"))) @@ -465,7 +465,7 @@ GROUP: Mail will be stored in GROUP (a string). junk: Mail will be deleted. Use with care! Do not submerge in water! Example: (setq nnmail-split-fancy - '(| (\"Subject\" \"MAKE MONEY FAST\" junk) + \\='(| (\"Subject\" \"MAKE MONEY FAST\" junk) ...other.rules.omitted...)) FIELD must match a complete field name. VALUE must match a complete diff --git a/lisp/iimage.el b/lisp/iimage.el index 5852c94..08808b1 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el @@ -71,7 +71,7 @@ NUM specifies which parenthesized expression in the regexp. Examples of image filename patterns to match: file://foo.png - `file://foo.png' + \\=`file://foo.png\\=' \\[\\[foo.gif]] foo.JPG diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el index 9e5a450..7caa5d4 100644 --- a/lisp/international/ogonek.el +++ b/lisp/international/ogonek.el @@ -244,17 +244,17 @@ The functions come in the following groups. (defun deprefixify-iso8859-2-region (start end) (interactive \"*r\") (ogonek-deprefixify-region start end ?/ \"iso8859-2\")) - (global-set-key \"\\C-cd\" 'deprefixify-iso8859-2-region) ; ctrl-c d + (global-set-key \"\\C-cd\" \\='deprefixify-iso8859-2-region) ; ctrl-c d (defun mazovia-to-iso8859-2 (start end) (interactive \"*r\") (ogonek-recode-region start end \"mazovia\" \"iso8859-2\")) - (global-set-key \"\\C-cr\" 'mazovia-to-iso8859-2) ; ctrl-c r + (global-set-key \"\\C-cr\" \\='mazovia-to-iso8859-2) ; ctrl-c r (defun prefixify-iso8859-2-region (start end) (interactive \"*r\") (ogonek-prefixify-region start end \"iso8859-2\" ?/)) - (global-set-key \"\\C-cp\" 'prefixify-iso8859-2-region) ; ctrl-c p + (global-set-key \"\\C-cp\" \\='prefixify-iso8859-2-region) ; ctrl-c p Each recoding operation can be called off using the `undo' command.") diff --git a/lisp/msb.el b/lisp/msb.el index 03b2920..b717dcc 100644 --- a/lisp/msb.el +++ b/lisp/msb.el @@ -777,7 +777,7 @@ SORT-PREDICATE. Example: \(msb--aggregate-alist - '((a . a1) (a . a2) (b . b1) (c . c3) (a . a4) (a . a3) (b . b3) (b . b2)) + \\='((a . a1) (a . a2) (b . b1) (c . c3) (a . a4) (a . a3) (b . b3) (b . b2)) (function string=) (lambda (item1 item2) (string< (symbol-name item1) (symbol-name item2)))) diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 8f77541..a7efaf8 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -377,7 +377,7 @@ Example: \(dbus-call-method-asynchronously :system \"org.freedesktop.Hal\" \"/org/freedesktop/Hal/devices/computer\" - \"org.freedesktop.Hal.Device\" \"GetPropertyString\" 'message + \"org.freedesktop.Hal.Device\" \"GetPropertyString\" \\='message \"system.kernel.machine\") => \(:serial :system 2) @@ -654,7 +654,7 @@ Example: \(dbus-register-signal :system \"org.freedesktop.Hal\" \"/org/freedesktop/Hal/Manager\" - \"org.freedesktop.Hal.Manager\" \"DeviceAdded\" 'my-signal-handler) + \"org.freedesktop.Hal.Manager\" \"DeviceAdded\" \\='my-signal-handler) => \(\(:signal :system \"org.freedesktop.Hal.Manager\" \"DeviceAdded\") \(\"org.freedesktop.Hal\" \"/org/freedesktop/Hal/Manager\" my-signal-handler)) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 6bafae0..6cec3c5 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1750,7 +1750,7 @@ Example: (tramp-set-completion-function \"ssh\" - '((tramp-parse-sconfig \"/etc/ssh_config\") + \\='((tramp-parse-sconfig \"/etc/ssh_config\") (tramp-parse-sconfig \"~/.ssh/config\")))" (let ((r function-list) diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el index 0a15f50..de0b1d9 100644 --- a/lisp/obsolete/sregex.el +++ b/lisp/obsolete/sregex.el @@ -262,15 +262,15 @@ This is exactly like `sregexq' (q.v.) except that it evaluates all its arguments, so literal sregex clauses must be quoted. For example: - (sregex '(or \"Bob\" \"Robert\")) => \"Bob\\\\|Robert\" + (sregex \\='(or \"Bob\" \"Robert\")) => \"Bob\\\\|Robert\" An argument-evaluating sregex interpreter lets you reuse sregex subexpressions: - (let ((dotstar '(0+ any)) - (whitespace '(1+ (syntax ?-))) - (digits '(1+ (char (?0 . ?9))))) - (sregex 'bol dotstar \":\" whitespace digits)) => \"^.*:\\\\s-+[0-9]+\"" + (let ((dotstar \\='(0+ any)) + (whitespace \\='(1+ (syntax ?-))) + (digits \\='(1+ (char (?0 . ?9))))) + (sregex \\='bol dotstar \":\" whitespace digits)) => \"^.*:\\\\s-+[0-9]+\"" (sregex--sequence exps nil)) (defmacro sregexq (&rest exps) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index a3c8b84..3a87f6b 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -1990,8 +1990,8 @@ the lower-case version of all tags." "Alist of characters and custom functions for bulk actions. For example, this value makes those two functions available: - '((?R set-category) - (?C bulk-cut)) + ((?R set-category) + (?C bulk-cut)) With selected entries in an agenda buffer, `B R' will call the custom function `set-category' on the selected entries. @@ -4937,13 +4937,13 @@ the `regexp' or `notregexp' element. `todo' and `nottodo' accept as an argument a list of todo keywords, which may include \"*\" to match any todo keyword. - (org-agenda-skip-entry-if 'todo '(\"TODO\" \"WAITING\")) + (org-agenda-skip-entry-if \\='todo \\='(\"TODO\" \"WAITING\")) would skip all entries with \"TODO\" or \"WAITING\" keywords. Instead of a list, a keyword class may be given. For example: - (org-agenda-skip-entry-if 'nottodo 'done) + (org-agenda-skip-entry-if \\='nottodo \\='done) would skip entries that haven't been marked with any of \"DONE\" keywords. Possible classes are: `todo', `done', `any'. @@ -10005,10 +10005,10 @@ calling the function returns nil. This function takes one argument: an entry from `org-agenda-get-day-entries'. FILTER can also be an alist with the car of each cell being -either 'headline or 'category. For example: +either `headline' or `category'. For example: - '((headline \"IMPORTANT\") - (category \"Work\")) + ((headline \"IMPORTANT\") + (category \"Work\")) will only add headlines containing IMPORTANT or headlines belonging to the \"Work\" category. diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index 4d9e79f..ae0f494 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -197,7 +197,7 @@ Possible properties are: Example: (setq org-protocol-project-alist - '((\"http://orgmode.org/worg/\" + \\='((\"http://orgmode.org/worg/\" :online-suffix \".php\" :working-suffix \".org\" :base-url \"http://orgmode.org/worg/\" @@ -251,7 +251,7 @@ kill-client - If t, kill the client immediately, once the sub-protocol is Here is an example: (setq org-protocol-protocol-alist - '((\"my-protocol\" + \\='((\"my-protocol\" :protocol \"my-protocol\" :function my-protocol-handler-function) (\"your-protocol\" diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el index 144b58b..fc4f574 100644 --- a/lisp/org/ox-html.el +++ b/lisp/org/ox-html.el @@ -833,7 +833,7 @@ you can reuse them: For example: \(setq org-html-table-row-tags - (cons '(cond (top-row-p \"\") + (cons \\='(cond (top-row-p \"\") (bottom-row-p \"\") (t (if (= (mod row-number 2) 1) \"\" diff --git a/lisp/outline.el b/lisp/outline.el index d9142c5..816cd9a 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -338,7 +338,7 @@ numbered and unnumbered sections), list them set by set and sorted by level within each set. For example in texinfo mode: (setq outline-heading-alist - '((\"@chapter\" . 2) (\"@section\" . 3) (\"@subsection\" . 4) + \\='((\"@chapter\" . 2) (\"@section\" . 3) (\"@subsection\" . 4) (\"@subsubsection\" . 5) (\"@unnumbered\" . 2) (\"@unnumberedsec\" . 3) (\"@unnumberedsubsec\" . 4) (\"@unnumberedsubsubsec\" . 5) diff --git a/lisp/printing.el b/lisp/printing.el index 8ad56f4..ae0f3fd 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -1746,14 +1746,14 @@ Examples: * On GNU or Unix system: - '((unix \".\" \"~/bin\" ghostview mpage PATH) + ((unix \".\" \"~/bin\" ghostview mpage PATH) (ghostview \"$HOME/bin/gsview-dir\") (mpage \"$HOME/bin/mpage-dir\") ) * On Windows system: - '((windows \"c:/applications/executables\" PATH ghostview mpage) + ((windows \"c:/applications/executables\" PATH ghostview mpage) (ghostview \"c:/gs/gsview-dir\") (mpage \"c:/mpage-dir\") )" @@ -1810,8 +1810,8 @@ Where: SYMBOL It's a symbol to identify a text printer. It's for setting option `pr-txt-name' and for menu selection. Examples: - 'prt_06a - 'my_printer + prt_06a + my_printer COMMAND Name of the program for printing a text file. On MS-DOS and MS-Windows systems, if the value is an empty string, then Emacs @@ -1838,7 +1838,7 @@ SWITCHES List of sexp's to pass as extra options for text printer instead of including an explicit switch on this list. Example: . for lpr - '(\"-#3\" \"-l\") + (\"-#3\" \"-l\") nil NAME A string that specifies a text printer name. @@ -1869,13 +1869,13 @@ Examples: * On GNU or Unix system: - '((prt_06a \"lpr\" nil \"prt_06a\") + ((prt_06a \"lpr\" nil \"prt_06a\") (prt_07c nil nil \"prt_07c\") ) * On Windows system: - '((prt_06a \"print\" nil \"/D:\\\\\\\\printers\\\\prt_06a\") + ((prt_06a \"print\" nil \"/D:\\\\\\\\printers\\\\prt_06a\") (prt_07c nil nil \"/D:\\\\\\\\printers\\\\prt_07c\") (PRN \"\" nil \"PRN\") (standard \"redpr.exe\" nil \"\") @@ -1961,8 +1961,8 @@ Where: SYMBOL It's a symbol to identify a PostScript printer. It's for setting option `pr-ps-name' and for menu selection. Examples: - 'prt_06a - 'my_printer + prt_06a + my_printer COMMAND Name of the program for printing a PostScript file. On MS-DOS and MS-Windows systems, if the value is an empty string then @@ -1991,11 +1991,11 @@ SWITCHES List of sexp's to pass as extra options for PostScript printer instead of including an explicit switch on this list. Example: . for lpr - '(\"-#3\" \"-l\") + (\"-#3\" \"-l\") nil . for gsprint.exe - '(\"-all\" \"-twoup\") + (\"-all\" \"-twoup\") PRINTER-SWITCH A string that specifies PostScript printer name switch. If it's necessary to have a space between PRINTER-SWITCH and NAME, @@ -2057,9 +2057,9 @@ DEFAULT It's a way to set default values when this entry is selected. which the current setting inherits the context. Take care with circular inheritance. Examples: - '(ps-landscape-mode . nil) - '(ps-spool-duplex . t) - '(pr-gs-device . (my-gs-device t)) + (ps-landscape-mode . nil) + (ps-spool-duplex . t) + (pr-gs-device . (my-gs-device t)) This variable should be modified by customization engine. If this variable is modified by other means (for example, a lisp function), use `pr-update-menus' @@ -2069,14 +2069,14 @@ Examples: * On GNU or Unix system: - '((lps_06b \"lpr\" nil \"-P\" \"lps_06b\") + ((lps_06b \"lpr\" nil \"-P\" \"lps_06b\") (lps_07c \"lpr\" nil nil \"lps_07c\") (lps_08c nil nil nil \"lps_08c\") ) * On Windows system: - '((lps_06a \"print\" nil \"/D:\" \"\\\\\\\\printers\\\\lps_06a\") + ((lps_06a \"print\" nil \"/D:\" \"\\\\\\\\printers\\\\lps_06a\") (lps_06b \"print\" nil nil \"\\\\\\\\printers\\\\lps_06b\") (lps_07c \"print\" nil \"\" \"/D:\\\\\\\\printers\\\\lps_07c\") (lps_08c nil nil nil \"\\\\\\\\printers\\\\lps_08c\") @@ -2102,7 +2102,7 @@ Also the gsprint utility comes together with gsview distribution. As an example of gsprint declaration: (setq pr-ps-printer-alist - '((A \"gsprint\" (\"-all\" \"-twoup\") \"-printer \" \"lps_015\") + \\='((A \"gsprint\" (\"-all\" \"-twoup\") \"-printer \" \"lps_015\") (B \"gsprint\" (\"-all\" \"-twoup\") nil \"-printer lps_015\") ;; some other printer declaration )) @@ -2594,9 +2594,9 @@ DEFAULT It's a way to set default values when this entry is selected. which the current setting inherits the context. Take care with circular inheritance. Examples: - '(ps-landscape-mode . nil) - '(ps-spool-duplex . t) - '(pr-gs-device . (my-gs-device t))" + (ps-landscape-mode . nil) + (ps-spool-duplex . t) + (pr-gs-device . (my-gs-device t))" :type '(repeat (list :tag "" @@ -2690,8 +2690,8 @@ Where: SYMBOL It's a symbol to identify a PostScript utility. It's for `pr-ps-utility' variable setting and for menu selection. Examples: - 'mpage - 'psnup + mpage + psnup UTILITY Name of utility for processing a PostScript file. See also `pr-path-alist'. @@ -2708,7 +2708,7 @@ MUST-SWITCHES List of sexp's to pass as options to the PostScript utility program and must be placed before any other switches. Example: . for psnup: - '(\"-q\") + (\"-q\") PAPERSIZE It's a format string to specify paper size switch. Example: @@ -2752,7 +2752,7 @@ SWITCHES List of sexp's to pass as extra options to the PostScript utility program. Example: . for psnup - '(\"-q\") + (\"-q\") nil DEFAULT It's a way to set default values when this entry is selected. @@ -2772,9 +2772,9 @@ DEFAULT It's a way to set default values when this entry is selected. which the current setting inherits the context. Take care with circular inheritance. Examples: - '(pr-file-landscape . nil) - '(pr-file-duplex . t) - '(pr-gs-device . (my-gs-device t)) + (pr-file-landscape . nil) + (pr-file-duplex . t) + (pr-gs-device . (my-gs-device t)) This variable should be modified by customization engine. If this variable is modified by other means (for example, a lisp function), use `pr-update-menus' @@ -2787,14 +2787,14 @@ Examples: * On GNU or Unix system: - '((mpage \"mpage\" nil \"-b%s\" \"-%d\" \"-l\" \"-t\" \"-T\" \">\" nil) + ((mpage \"mpage\" nil \"-b%s\" \"-%d\" \"-l\" \"-t\" \"-T\" \">\" nil) (psnup \"psnup\" (\"-q\") \"-P%s\" \"-%d\" \"-l\" nil nil \" \" nil (pr-file-duplex . nil) (pr-file-tumble . nil)) ) * On Windows system: - '((psnup \"c:/psutils/psnup\" (\"-q\") \"-P%s\" \"-%d\" \"-l\" nil nil \" \" + ((psnup \"c:/psutils/psnup\" (\"-q\") \"-P%s\" \"-%d\" \"-l\" nil nil \" \" nil (pr-file-duplex . nil) (pr-file-tumble . nil)) ) diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 611ba84..d38a7cd 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -171,7 +171,7 @@ is the symbol being selected. Example value: - '((\"Emacs Lisp\" Info-goto-emacs-command-node obarray) + ((\"Emacs Lisp\" Info-goto-emacs-command-node obarray) (\"Common Lisp\" common-lisp-hyperspec common-lisp-hyperspec-obarray) (\"SCWM\" scwm-documentation scwm-obarray))" :group 'etags diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index fb4d445..845abc0 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -323,13 +323,13 @@ Hideshow puts a unique overlay on each range of text to be hidden in the buffer. Here is a simple example of how to use this variable: (defun display-code-line-counts (ov) - (when (eq 'code (overlay-get ov 'hs)) - (overlay-put ov 'display + (when (eq \\='code (overlay-get ov \\='hs)) + (overlay-put ov \\='display (format \"... / %d\" (count-lines (overlay-start ov) (overlay-end ov)))))) - (setq hs-set-up-overlay 'display-code-line-counts) + (setq hs-set-up-overlay \\='display-code-line-counts) This example shows how to get information from the overlay as well as how to set its `display' property. See `hs-make-overlay' and diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 18299c7..daf919a 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -1571,11 +1571,11 @@ Otherwise, if SELECT is non-nil then only an action is created. Some examples: No spaces before and 1 after a comma - (idlwave-action-and-binding \",\" '(idlwave-surround 0 1)) + (idlwave-action-and-binding \",\" \\='(idlwave-surround 0 1)) A minimum of 1 space before and after `=' (see `idlwave-expand-equal'). - (idlwave-action-and-binding \"=\" '(idlwave-expand-equal -1 -1)) + (idlwave-action-and-binding \"=\" \\='(idlwave-expand-equal -1 -1)) Capitalize system variables - action only - (idlwave-action-and-binding idlwave-sysvar '(capitalize-word 1) t)" + (idlwave-action-and-binding idlwave-sysvar \\='(capitalize-word 1) t)" (if (not (equal select 'noaction)) ;; Add action (let* ((table (if select 'idlwave-indent-action-table diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 18f445c..f46c8a9 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -2609,8 +2609,8 @@ of the current highlighting list. For example: - (sql-add-product-keywords 'ms - '((\"\\\\b\\\\w+_t\\\\b\" . font-lock-type-face))) + (sql-add-product-keywords \\='ms + \\='((\"\\\\b\\\\w+_t\\\\b\" . font-lock-type-face))) adds a fontification pattern to fontify identifiers ending in `_t' as data types." diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 76d85c6..caae746 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -12794,7 +12794,7 @@ Constant signals: is put into the AUTOSENSE list and is not desired, use the AUTO_CONSTANT declaration anywhere in the module (parenthesis are required): - /* AUTO_CONSTANT ( `this_is_really_constant_dont_autosense_it ) */ + /* AUTO_CONSTANT ( \\=`this_is_really_constant_dont_autosense_it ) */ Better yet, use a parameter, which will be understood to be constant automatically. @@ -12810,16 +12810,16 @@ OOps! An example: always @ (/*AS*/) begin - /* AUTO_CONSTANT (`constant) */ - outin = ina | inb | `constant; + /* AUTO_CONSTANT (\\=`constant) */ + outin = ina | inb | \\=`constant; out = outin; end Typing \\[verilog-auto] will make this into: always @ (/*AS*/ina or inb) begin - /* AUTO_CONSTANT (`constant) */ - outin = ina | inb | `constant; + /* AUTO_CONSTANT (\\=`constant) */ + outin = ina | inb | \\=`constant; out = outin; end @@ -12827,7 +12827,7 @@ Note in Verilog 2001, you can often get the same result from the new @* operator. (This was added to the language in part due to AUTOSENSE!) always @* begin - outin = ina | inb | `constant; + outin = ina | inb | \\=`constant; out = outin; end" (save-excursion diff --git a/lisp/ps-print.el b/lisp/ps-print.el index faafe9c..218a02a 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -1953,7 +1953,7 @@ If you set option `ps-selected-pages', first the pages are filtered by option `ps-selected-pages' and then by `ps-even-or-odd-pages'. For example, if we have: - (setq ps-selected-pages '(1 4 (6 . 10) (12 . 16) 20)) + (setq ps-selected-pages \\='(1 4 (6 . 10) (12 . 16) 20)) Combining with `ps-even-or-odd-pages' and option `ps-n-up-printing', we have: @@ -2249,9 +2249,9 @@ X, Y, XSCALE, YSCALE and ROTATION may be a floating point number, an integer number or a string. If it is a string, the string should contain PostScript programming that returns a float or integer value. -For example, if you wish to print an EPS image on all pages do: +For example, if you wish to print an EPS image on all pages use: - '((\"~/images/EPS-image.ps\"))" + ((\"~/images/EPS-image.ps\"))" :type '(repeat (list (file :tag "EPS File") @@ -2300,9 +2300,9 @@ X, Y, FONTSIZE, GRAY and ROTATION may be a floating point number, an integer number or a string. If it is a string, the string should contain PostScript programming that returns a float or integer value. -For example, if you wish to print text \"Preliminary\" on all pages do: +For example, if you wish to print text \"Preliminary\" on all pages use: - '((\"Preliminary\"))" + ((\"Preliminary\"))" :type '(repeat (list (string :tag "Text") diff --git a/lisp/server.el b/lisp/server.el index 57c16af..b16a06e 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1649,7 +1649,7 @@ only these files will be asked to be saved." "Contact the Emacs server named SERVER and evaluate FORM there. Returns the result of the evaluation, or signals an error if it cannot contact the specified server. For example: - (server-eval-at \"server\" '(emacs-pid)) + (server-eval-at \"server\" \\='(emacs-pid)) returns the process ID of the Emacs instance running \"server\"." (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)) (server-file (expand-file-name server server-dir)) diff --git a/lisp/ses.el b/lisp/ses.el index 0bc43ec..ec1359b 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -1491,11 +1491,11 @@ by (ROWINCR,COLINCR)." "Produce a copy of FORMULA where all symbols that refer to cells in row STARTROW or above, and col STARTCOL or above, are altered by adding ROWINCR and COLINCR. STARTROW and STARTCOL are 0-based. Example: - (ses-relocate-formula '(+ A1 B2 D3) 1 2 1 -1) + (ses-relocate-formula \\='(+ A1 B2 D3) 1 2 1 -1) => (+ A1 B2 C4) If ROWINCR or COLINCR is negative, references to cells being deleted are removed. Example: - (ses-relocate-formula '(+ A1 B2 D3) 0 1 0 -1) + (ses-relocate-formula \\='(+ A1 B2 D3) 0 1 0 -1) => (+ A1 C3) Sets `ses-relocate-return' to 'delete if cell-references were removed." (let (rowcol result) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 93b31d5..9c50eca 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -3349,17 +3349,17 @@ Example: (progn (table-insert 16 3 5 1) (table-forward-cell 15) - (table-insert-sequence \"D0\" -16 1 1 'center) + (table-insert-sequence \"D0\" -16 1 1 \\='center) (table-forward-cell 16) - (table-insert-sequence \"A[0]\" -16 1 1 'center) + (table-insert-sequence \"A[0]\" -16 1 1 \\='center) (table-forward-cell 1) - (table-insert-sequence \"-\" 16 0 1 'center)) + (table-insert-sequence \"-\" 16 0 1 \\='center)) (progn (table-insert 16 8 5 1) - (table-insert-sequence \"@\" 0 1 2 'right) + (table-insert-sequence \"@\" 0 1 2 \\='right) (table-forward-cell 1) - (table-insert-sequence \"64\" 0 1 2 'left))" + (table-insert-sequence \"64\" 0 1 2 \\='left))" (interactive (progn (barf-if-buffer-read-only) diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index 4e385a0..c94e417 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -291,8 +291,8 @@ BEG argument is ignored. This function is meant to be used to set `tildify-foreach-region-function' variable. For example, for an XML file one might use: (setq-local tildify-foreach-region-function - (apply-partially 'tildify-foreach-ignore-environments - '((\"\") (\"<\" . \">\"))))" + (apply-partially \\='tildify-foreach-ignore-environments + \\='((\"\") (\"<\" . \">\"))))" (let ((beg-re (concat "\\(?:" (mapconcat 'car pairs "\\)\\|\\(?:") "\\)")) p end-re) (save-excursion diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 0c8f4af..b64de47 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -3477,10 +3477,10 @@ themselves. A list, for example, is defined as either nil, or a cons cell whose cdr itself is a list. The obvious way to translate this into a widget type would be - (define-widget 'my-list 'choice + (define-widget \\='my-list \\='choice \"A list of sexps.\" :tag \"Sexp list\" - :args '((const nil) (cons :value (nil) sexp my-list))) + :args \\='((const nil) (cons :value (nil) sexp my-list))) Here we attempt to define my-list as a choice of either the constant nil, or a cons-cell containing a sexp and my-lisp. This will not work @@ -3489,10 +3489,10 @@ because the `choice' widget does not allow recursion. Using the `lazy' widget you can overcome this problem, as in this example: - (define-widget 'sexp-list 'lazy + (define-widget \\='sexp-list \\='lazy \"A list of sexps.\" :tag \"Sexp list\" - :type '(choice (const nil) (cons :value (nil) sexp sexp-list)))" + :type \\='(choice (const nil) (cons :value (nil) sexp sexp-list)))" :format "%{%t%}: %v" ;; We don't convert :type because we want to allow recursive ;; data structures. This is slow, so we should not create speed diff --git a/src/category.c b/src/category.c index ab90f5f..bb4a75d 100644 --- a/src/category.c +++ b/src/category.c @@ -491,7 +491,7 @@ between C1 and C2. For instance, to tell that there's a word boundary between Hiragana and Katakana (both are in the same script `kana'), -the element `(?H . ?K) should be in this list. */); +the element `(?H . ?K)' should be in this list. */); Vword_combining_categories = Qnil; commit 5dc644a6b01e2cf950ff617ab15be4bf1917c38c Author: Stefan Monnier Date: Tue Sep 1 21:14:18 2015 -0400 Generalize the prefix-command machinery of C-u * lisp/simple.el (prefix-command-echo-keystrokes-functions) (prefix-command-preserve-state-hook): New hooks. (internal-echo-keystrokes-prefix): New function. (prefix-command--needs-update, prefix-command--last-echo): New vars. (prefix-command-update, prefix-command-preserve): New functions. (reset-this-command-lengths): New compatibility definition. (universal-argument--mode): Call prefix-command-update. (universal-argument, universal-argument-more, negative-argument) (digit-argument): Call prefix-command-preserve-state. * src/keyboard.c: Call internal-echo-keystrokes-prefix to build the "prefix argument" to echo. (this_command_key_count_reset, before_command_key_count) (before_command_echo_length): Delete variables. (echo_add_key): Always add a space. (echo_char): Remove. (echo_dash): Don't give up when this_command_key_count is 0, since that is now the case after a prefix command. (echo_update): New function, extracted from echo_now. (echo_now): Use it. (add_command_key, read_char, record_menu_key): Remove old disabled code. (command_loop_1): Don't refrain from pushing an undo boundary when prefix-arg is set. Remove other prefix-arg special case, now handled directly in the prefix commands instead. But call echo_now if there's a prefix state to echo. (read_char, record_menu_key): Use echo_update instead of echo_char. (read_key_sequence): Use echo_now rather than echo_dash/echo_char. (Freset_this_command_lengths): Delete function. (syms_of_keyboard): Define Qinternal_echo_keystrokes_prefix. (syms_of_keyboard): Don't defsubr Sreset_this_command_lengths. * lisp/simple.el: Use those new hooks for C-u. (universal-argument--description): New function. (prefix-command-echo-keystrokes-functions): Use it. (universal-argument--preserve): New function. (prefix-command-preserve-state-hook): Use it. (command-execute): Call prefix-command-update if needed. * lisp/kmacro.el (kmacro-step-edit-prefix-commands) (kmacro-step-edit-prefix-index): Delete variables. (kmacro-step-edit-query, kmacro-step-edit-insert): Remove ad-hoc support for prefix arg commands. (kmacro-step-edit-macro): Don't bind kmacro-step-edit-prefix-index. * lisp/emulation/cua-base.el (cua--prefix-override-replay) (cua--shift-control-prefix): Use prefix-command-preserve-state. Remove now unused arg `arg'. (cua--prefix-override-handler, cua--prefix-repeat-handler) (cua--shift-control-c-prefix, cua--shift-control-x-prefix): Update accordingly. (cua--prefix-override-timeout): Don't call reset-this-command-lengths any more. (cua--keep-active, cua-exchange-point-and-mark): Don't set mark-active if the mark is not set. diff --git a/etc/NEWS b/etc/NEWS index 3832ffa..e50e7a7 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -965,6 +965,10 @@ be updated accordingly. * Lisp Changes in Emacs 25.1 +** New hooks prefix-command-echo-keystrokes-functions and +prefix-command-preserve-state-hook, to allow the definition of prefix +commands other than the predefined C-u. + ** New functions `filepos-to-bufferpos' and `bufferpos-to-filepos'. ** The default value of `load-read-function' is now `read'. diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index e91ce80..52e1647 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -685,7 +685,7 @@ a cons (TYPE . COLOR), then both properties are affected." (defvar cua--prefix-override-timer nil) (defvar cua--prefix-override-length nil) -(defun cua--prefix-override-replay (arg repeat) +(defun cua--prefix-override-replay (repeat) (let* ((keys (this-command-keys)) (i (length keys)) (key (aref keys (1- i)))) @@ -705,21 +705,23 @@ a cons (TYPE . COLOR), then both properties are affected." ;; Don't record this command (setq this-command last-command) ;; Restore the prefix arg - (setq prefix-arg arg) - (reset-this-command-lengths) + ;; This should make it so that exchange-point-and-mark gets the prefix when + ;; you do C-u C-x C-x C-x work (where the C-u is properly passed to the C-x + ;; C-x binding after the first C-x C-x was rewritten to just C-x). + (prefix-command-preserve-state) ;; Push the key back on the event queue (setq unread-command-events (cons key unread-command-events)))) -(defun cua--prefix-override-handler (arg) +(defun cua--prefix-override-handler () "Start timer waiting for prefix key to be followed by another key. Repeating prefix key when region is active works as a single prefix key." - (interactive "P") - (cua--prefix-override-replay arg 0)) + (interactive) + (cua--prefix-override-replay 0)) -(defun cua--prefix-repeat-handler (arg) +(defun cua--prefix-repeat-handler () "Repeating prefix key when region is active works as a single prefix key." - (interactive "P") - (cua--prefix-override-replay arg 1)) + (interactive) + (cua--prefix-override-replay 1)) (defun cua--prefix-copy-handler (arg) "Copy region/rectangle, then replay last key." @@ -742,7 +744,8 @@ Repeating prefix key when region is active works as a single prefix key." (when (= (length (this-command-keys)) cua--prefix-override-length) (setq unread-command-events (cons 'timeout unread-command-events)) (if prefix-arg - (reset-this-command-lengths) + nil + ;; FIXME: Why? (setq overriding-terminal-local-map nil)) (cua--select-keymaps))) @@ -755,8 +758,9 @@ Repeating prefix key when region is active works as a single prefix key." (call-interactively this-command)) (defun cua--keep-active () - (setq mark-active t - deactivate-mark nil)) + (when (mark t) + (setq mark-active t + deactivate-mark nil))) (defun cua--deactivate (&optional now) (if (not now) @@ -944,7 +948,7 @@ See also `exchange-point-and-mark'." (cond ((null cua-enable-cua-keys) (exchange-point-and-mark arg)) (arg - (setq mark-active t)) + (when (mark t) (setq mark-active t))) (t (let (mark-active) (exchange-point-and-mark) @@ -1212,25 +1216,28 @@ If ARG is the atom `-', scroll upward by nearly full screen." (defvar cua--keymaps-initialized nil) -(defun cua--shift-control-prefix (prefix arg) +(defun cua--shift-control-prefix (prefix) ;; handle S-C-x and S-C-c by emulating the fast double prefix function. ;; Don't record this command (setq this-command last-command) ;; Restore the prefix arg - (setq prefix-arg arg) - (reset-this-command-lengths) + ;; This should make it so that exchange-point-and-mark gets the prefix when + ;; you do C-u S-C-x C-x work (where the C-u is properly passed to the C-x + ;; C-x binding after the first S-C-x was rewritten to just C-x). + (prefix-command-preserve-state) ;; Activate the cua--prefix-repeat-keymap (setq cua--prefix-override-timer 'shift) ;; Push duplicate keys back on the event queue - (setq unread-command-events (cons prefix (cons prefix unread-command-events)))) + (setq unread-command-events + (cons prefix (cons prefix unread-command-events)))) -(defun cua--shift-control-c-prefix (arg) - (interactive "P") - (cua--shift-control-prefix ?\C-c arg)) +(defun cua--shift-control-c-prefix () + (interactive) + (cua--shift-control-prefix ?\C-c)) -(defun cua--shift-control-x-prefix (arg) - (interactive "P") - (cua--shift-control-prefix ?\C-x arg)) +(defun cua--shift-control-x-prefix () + (interactive) + (cua--shift-control-prefix ?\C-x)) (defun cua--init-keymaps () ;; Cache actual rectangle modifier key. diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 9636a36..ddf3005 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -941,7 +941,6 @@ without repeating the prefix." (defvar kmacro-step-edit-inserting) ;; inserting into macro (defvar kmacro-step-edit-appending) ;; append to end of macro (defvar kmacro-step-edit-replace) ;; replace orig macro when done -(defvar kmacro-step-edit-prefix-index) ;; index of first prefix arg key (defvar kmacro-step-edit-key-index) ;; index of current key (defvar kmacro-step-edit-action) ;; automatic action on next pre-command hook (defvar kmacro-step-edit-help) ;; kmacro step edit help enabled @@ -976,11 +975,6 @@ This keymap is an extension to the `query-replace-map', allowing the following additional answers: `insert', `insert-1', `replace', `replace-1', `append', `append-end', `act-repeat', `skip-end', `skip-keep'.") -(defvar kmacro-step-edit-prefix-commands - '(universal-argument universal-argument-more universal-argument-minus - digit-argument negative-argument) - "Commands which build up a prefix arg for the current command.") - (defun kmacro-step-edit-prompt (macro index) ;; Show step-edit prompt (let ((keys (and (not kmacro-step-edit-appending) @@ -1084,21 +1078,13 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', ;; Handle prefix arg, or query user (cond (act act) ;; set above - ((memq this-command kmacro-step-edit-prefix-commands) - (unless kmacro-step-edit-prefix-index - (setq kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) - (setq act 'universal-argument)) - ((eq this-command 'universal-argument-other-key) - (setq act 'universal-argument)) (t - (kmacro-step-edit-prompt macro (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) + (kmacro-step-edit-prompt macro kmacro-step-edit-key-index) (setq act (lookup-key kmacro-step-edit-map (vector (with-current-buffer (current-buffer) (read-event)))))))) ;; Resume macro execution and perform the action (cond - ((eq act 'universal-argument) - nil) ((cond ((eq act 'act) t) @@ -1110,7 +1096,6 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (setq kmacro-step-edit-active 'ignore) nil) ((eq act 'skip) - (setq kmacro-step-edit-prefix-index nil) nil) ((eq act 'skip-keep) (setq this-command 'ignore) @@ -1123,12 +1108,11 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (setq act t) t) ((member act '(insert-1 insert)) - (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) + (setq executing-kbd-macro-index kmacro-step-edit-key-index) (setq kmacro-step-edit-inserting (if (eq act 'insert-1) 1 t)) nil) ((member act '(replace-1 replace)) (setq kmacro-step-edit-inserting (if (eq act 'replace-1) 1 t)) - (setq kmacro-step-edit-prefix-index nil) (if (= executing-kbd-macro-index (length executing-kbd-macro)) (setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) kmacro-step-edit-appending t)) @@ -1148,19 +1132,19 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (setq act t) t) ((eq act 'help) - (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) + (setq executing-kbd-macro-index kmacro-step-edit-key-index) (setq kmacro-step-edit-help (not kmacro-step-edit-help)) nil) (t ;; Ignore unknown responses - (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) + (setq executing-kbd-macro-index kmacro-step-edit-key-index) nil)) - (if (> executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) + (if (> executing-kbd-macro-index kmacro-step-edit-key-index) (setq kmacro-step-edit-new-macro (vconcat kmacro-step-edit-new-macro (substring executing-kbd-macro - (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index) - (if (eq act t) nil executing-kbd-macro-index))) - kmacro-step-edit-prefix-index nil)) + kmacro-step-edit-key-index + (if (eq act t) nil + executing-kbd-macro-index))))) (if restore-index (setq executing-kbd-macro-index restore-index))) (t @@ -1175,12 +1159,10 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (executing-kbd-macro nil) (defining-kbd-macro nil) cmd keys next-index) - (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index) - kmacro-step-edit-prefix-index nil) + (setq executing-kbd-macro-index kmacro-step-edit-key-index) (kmacro-step-edit-prompt macro nil) ;; Now, we have read a key sequence from the macro, but we don't want ;; to execute it yet. So push it back and read another sequence. - (reset-this-command-lengths) (setq keys (read-key-sequence nil nil nil nil t)) (setq cmd (key-binding keys t nil)) (if (cond @@ -1201,25 +1183,12 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', unread-command-events nil))) (setq cmd 'ignore) nil) - ((memq cmd kmacro-step-edit-prefix-commands) - (reset-this-command-lengths) - nil) - ((eq cmd 'universal-argument-other-key) - (setq kmacro-step-edit-action t) - (reset-this-command-lengths) - (if (numberp kmacro-step-edit-inserting) - (setq kmacro-step-edit-inserting nil)) - nil) ((numberp kmacro-step-edit-inserting) (setq kmacro-step-edit-inserting nil) nil) ((equal keys "\C-j") (setq kmacro-step-edit-inserting nil) (setq kmacro-step-edit-action nil) - ;; Forget any (partial) prefix arg from next command - (setq kmacro-step-edit-prefix-index nil) - (reset-this-command-lengths) - (setq overriding-terminal-local-map nil) (setq next-index kmacro-step-edit-key-index) t) (t nil)) @@ -1278,7 +1247,6 @@ To customize possible responses, change the \"bindings\" in `kmacro-step-edit-ma (kmacro-step-edit-inserting nil) (kmacro-step-edit-appending nil) (kmacro-step-edit-replace t) - (kmacro-step-edit-prefix-index nil) (kmacro-step-edit-key-index 0) (kmacro-step-edit-action nil) (kmacro-step-edit-help nil) diff --git a/lisp/simple.el b/lisp/simple.el index 6f76d75..b8d4e74 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1711,9 +1711,13 @@ The argument SPECIAL, if non-nil, means that this command is executing a special event, so ignore the prefix argument and don't clear it." (setq debug-on-next-call nil) (let ((prefixarg (unless special + ;; FIXME: This should probably be done around + ;; pre-command-hook rather than here! (prog1 prefix-arg (setq current-prefix-arg prefix-arg) - (setq prefix-arg nil))))) + (setq prefix-arg nil) + (when current-prefix-arg + (prefix-command-update)))))) (if (and (symbolp cmd) (get cmd 'disabled) disabled-command-function) @@ -3626,6 +3630,73 @@ see other processes running on the system, use `list-system-processes'." (display-buffer buffer) nil) +;;;; Prefix commands + +(setq prefix-command--needs-update nil) +(setq prefix-command--last-echo nil) + +(defun internal-echo-keystrokes-prefix () + ;; BEWARE: Called directly from the C code. + (if (not prefix-command--needs-update) + prefix-command--last-echo + (setq prefix-command--last-echo + (let ((strs nil)) + (run-hook-wrapped 'prefix-command-echo-keystrokes-functions + (lambda (fun) (push (funcall fun) strs))) + (setq strs (delq nil strs)) + (when strs (mapconcat #'identity strs " ")))))) + +(defvar prefix-command-echo-keystrokes-functions nil + "Abnormal hook which constructs the description of the current prefix state. +Each function is called with no argument, should return a string or nil.") + +(defun prefix-command-update () + "Update state of prefix commands. +Call it whenever you change the \"prefix command state\"." + (setq prefix-command--needs-update t)) + +(defvar prefix-command-preserve-state-hook nil + "Normal hook run when a command needs to preserve the prefix.") + +(defun prefix-command-preserve-state () + "Pass the current prefix command state to the next command. +Should be called by all prefix commands. +Runs `prefix-command-preserve-state-hook'." + (run-hooks 'prefix-command-preserve-state-hook) + ;; If the current command is a prefix command, we don't want the next (real) + ;; command to have `last-command' set to, say, `universal-argument'. + (setq this-command last-command) + (setq real-this-command real-last-command) + (prefix-command-update)) + +(defun reset-this-command-lengths () + (declare (obsolete prefix-command-preserve-state "25.1")) + nil) + +;;;;; The main prefix command. + +;; FIXME: Declaration of `prefix-arg' should be moved here!? + +(add-hook 'prefix-command-echo-keystrokes-functions + #'universal-argument--description) +(defun universal-argument--description () + (when prefix-arg + (concat "C-u" + (pcase prefix-arg + (`(-) " -") + (`(,(and (pred integerp) n)) + (let ((str "")) + (while (and (> n 4) (= (mod n 4) 0)) + (setq str (concat str " C-u")) + (setq n (/ n 4))) + (if (= n 4) str (format " %s" prefix-arg)))) + (_ (format " %s" prefix-arg)))))) + +(add-hook 'prefix-command-preserve-state-hook + #'universal-argument--preserve) +(defun universal-argument--preserve () + (setq prefix-arg current-prefix-arg)) + (defvar universal-argument-map (let ((map (make-sparse-keymap)) (universal-argument-minus @@ -3664,7 +3735,8 @@ see other processes running on the system, use `list-system-processes'." "Keymap used while processing \\[universal-argument].") (defun universal-argument--mode () - (set-transient-map universal-argument-map)) + (prefix-command-update) + (set-transient-map universal-argument-map nil)) (defun universal-argument () "Begin a numeric argument for the following command. @@ -3677,6 +3749,7 @@ For some commands, just \\[universal-argument] by itself serves as a flag which is different in effect from any particular numeric argument. These commands include \\[set-mark-command] and \\[start-kbd-macro]." (interactive) + (prefix-command-preserve-state) (setq prefix-arg (list 4)) (universal-argument--mode)) @@ -3684,6 +3757,7 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]." ;; A subsequent C-u means to multiply the factor by 4 if we've typed ;; nothing but C-u's; otherwise it means to terminate the prefix arg. (interactive "P") + (prefix-command-preserve-state) (setq prefix-arg (if (consp arg) (list (* 4 (car arg))) (if (eq arg '-) @@ -3695,6 +3769,7 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]." "Begin a negative numeric argument for the next command. \\[universal-argument] following digits or minus sign ends the argument." (interactive "P") + (prefix-command-preserve-state) (setq prefix-arg (cond ((integerp arg) (- arg)) ((eq arg '-) nil) (t '-))) @@ -3704,6 +3779,7 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]." "Part of the numeric argument for the next command. \\[universal-argument] following digits or minus sign ends the argument." (interactive "P") + (prefix-command-preserve-state) (let* ((char (if (integerp last-command-event) last-command-event (get last-command-event 'ascii-character))) diff --git a/src/keyboard.c b/src/keyboard.c index d7a533b..a8b1e98 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -107,10 +107,6 @@ static Lisp_Object recent_keys; Lisp_Object this_command_keys; ptrdiff_t this_command_key_count; -/* True after calling Freset_this_command_lengths. - Usually it is false. */ -static bool this_command_key_count_reset; - /* This vector is used as a buffer to record the events that were actually read by read_key_sequence. */ static Lisp_Object raw_keybuf; @@ -124,11 +120,6 @@ static int raw_keybuf_count; that precede this key sequence. */ static ptrdiff_t this_single_command_key_start; -/* Record values of this_command_key_count and echo_length () - before this command was read. */ -static ptrdiff_t before_command_key_count; -static ptrdiff_t before_command_echo_length; - #ifdef HAVE_STACK_OVERFLOW_HANDLING /* For longjmp to recover from C stack overflow. */ @@ -441,10 +432,12 @@ echo_add_key (Lisp_Object c) ptrdiff_t size = sizeof initbuf; char *buffer = initbuf; char *ptr = buffer; - Lisp_Object echo_string; + Lisp_Object echo_string = KVAR (current_kboard, echo_string); USE_SAFE_ALLOCA; - echo_string = KVAR (current_kboard, echo_string); + if (STRINGP (echo_string) && SCHARS (echo_string) > 0) + /* Add a space at the end as a separator between keys. */ + ptr++[0] = ' '; /* If someone has passed us a composite event, use its head symbol. */ c = EVENT_HEAD (c); @@ -486,48 +479,12 @@ echo_add_key (Lisp_Object c) ptr += len; } - /* Replace a dash from echo_dash with a space, otherwise add a space - at the end as a separator between keys. */ - AUTO_STRING (space, " "); - if (STRINGP (echo_string) && SCHARS (echo_string) > 1) - { - Lisp_Object last_char, prev_char, idx; - - idx = make_number (SCHARS (echo_string) - 2); - prev_char = Faref (echo_string, idx); - - idx = make_number (SCHARS (echo_string) - 1); - last_char = Faref (echo_string, idx); - - /* We test PREV_CHAR to make sure this isn't the echoing of a - minus-sign. */ - if (XINT (last_char) == '-' && XINT (prev_char) != ' ') - Faset (echo_string, idx, make_number (' ')); - else - echo_string = concat2 (echo_string, space); - } - else if (STRINGP (echo_string) && SCHARS (echo_string) > 0) - echo_string = concat2 (echo_string, space); - kset_echo_string (current_kboard, concat2 (echo_string, make_string (buffer, ptr - buffer))); SAFE_FREE (); } -/* Add C to the echo string, if echoing is going on. C can be a - character or a symbol. */ - -static void -echo_char (Lisp_Object c) -{ - if (current_kboard->immediate_echo) - { - echo_add_key (c); - echo_now (); - } -} - /* Temporarily add a dash to the end of the echo string if it's not empty, so that it serves as a mini-prompt for the very next character. */ @@ -539,9 +496,6 @@ echo_dash (void) if (NILP (KVAR (current_kboard, echo_string))) return; - if (this_command_key_count == 0) - return; - if (!current_kboard->immediate_echo && SCHARS (KVAR (current_kboard, echo_string)) == 0) return; @@ -574,39 +528,39 @@ echo_dash (void) echo_now (); } -/* Display the current echo string, and begin echoing if not already - doing so. */ - static void -echo_now (void) +echo_update (void) { - if (!current_kboard->immediate_echo) + if (current_kboard->immediate_echo) { ptrdiff_t i; - current_kboard->immediate_echo = true; + kset_echo_string (current_kboard, + call0 (Qinternal_echo_keystrokes_prefix)); for (i = 0; i < this_command_key_count; i++) { Lisp_Object c; - /* Set before_command_echo_length to the value that would - have been saved before the start of this subcommand in - command_loop_1, if we had already been echoing then. */ - if (i == this_single_command_key_start) - before_command_echo_length = echo_length (); - c = AREF (this_command_keys, i); if (! (EVENT_HAS_PARAMETERS (c) && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qmouse_movement))) - echo_char (c); + echo_add_key (c); } - /* Set before_command_echo_length to the value that would - have been saved before the start of this subcommand in - command_loop_1, if we had already been echoing then. */ - if (this_command_key_count == this_single_command_key_start) - before_command_echo_length = echo_length (); + echo_now (); + } +} + +/* Display the current echo string, and begin echoing if not already + doing so. */ +static void +echo_now (void) +{ + if (!current_kboard->immediate_echo) + { + current_kboard->immediate_echo = true; + echo_update (); /* Put a dash at the end to invite the user to type more. */ echo_dash (); } @@ -666,20 +620,6 @@ echo_truncate (ptrdiff_t nchars) static void add_command_key (Lisp_Object key) { -#if 0 /* Not needed after we made Freset_this_command_lengths - do the job immediately. */ - /* If reset-this-command-length was called recently, obey it now. - See the doc string of that function for an explanation of why. */ - if (before_command_restore_flag) - { - this_command_key_count = before_command_key_count_1; - if (this_command_key_count < this_single_command_key_start) - this_single_command_key_start = this_command_key_count; - echo_truncate (before_command_echo_length_1); - before_command_restore_flag = 0; - } -#endif - if (this_command_key_count >= ASIZE (this_command_keys)) this_command_keys = larger_vector (this_command_keys, 1, -1); @@ -1285,10 +1225,6 @@ static void adjust_point_for_property (ptrdiff_t, bool); /* The last boundary auto-added to buffer-undo-list. */ Lisp_Object last_undo_boundary; -/* FIXME: This is wrong rather than test window-system, we should call - a new set-selection, which will then dispatch to x-set-selection, or - tty-set-selection, or w32-set-selection, ... */ - Lisp_Object command_loop_1 (void) { @@ -1306,7 +1242,6 @@ command_loop_1 (void) cancel_echoing (); this_command_key_count = 0; - this_command_key_count_reset = false; this_single_command_key_start = 0; if (NILP (Vmemory_full)) @@ -1394,9 +1329,6 @@ command_loop_1 (void) && !NILP (Ffboundp (Qrecompute_lucid_menubar))) call0 (Qrecompute_lucid_menubar); - before_command_key_count = this_command_key_count; - before_command_echo_length = echo_length (); - Vthis_command = Qnil; Vreal_this_command = Qnil; Vthis_original_command = Qnil; @@ -1424,7 +1356,6 @@ command_loop_1 (void) { cancel_echoing (); this_command_key_count = 0; - this_command_key_count_reset = false; this_single_command_key_start = 0; goto finalize; } @@ -1509,14 +1440,13 @@ command_loop_1 (void) } #endif - if (NILP (KVAR (current_kboard, Vprefix_arg))) /* FIXME: Why? --Stef */ - { - Lisp_Object undo = BVAR (current_buffer, undo_list); - Fundo_boundary (); - last_undo_boundary - = (EQ (undo, BVAR (current_buffer, undo_list)) - ? Qnil : BVAR (current_buffer, undo_list)); - } + { + Lisp_Object undo = BVAR (current_buffer, undo_list); + Fundo_boundary (); + last_undo_boundary + = (EQ (undo, BVAR (current_buffer, undo_list)) + ? Qnil : BVAR (current_buffer, undo_list)); + } call1 (Qcommand_execute, Vthis_command); #ifdef HAVE_WINDOW_SYSTEM @@ -1544,31 +1474,23 @@ command_loop_1 (void) safe_run_hooks (Qdeferred_action_function); - /* If there is a prefix argument, - 1) We don't want Vlast_command to be ``universal-argument'' - (that would be dumb), so don't set Vlast_command, - 2) we want to leave echoing on so that the prefix will be - echoed as part of this key sequence, so don't call - cancel_echoing, and - 3) we want to leave this_command_key_count non-zero, so that - read_char will realize that it is re-reading a character, and - not echo it a second time. - - If the command didn't actually create a prefix arg, - but is merely a frame event that is transparent to prefix args, - then the above doesn't apply. */ - if (NILP (KVAR (current_kboard, Vprefix_arg)) - || CONSP (last_command_event)) + kset_last_command (current_kboard, Vthis_command); + kset_real_last_command (current_kboard, Vreal_this_command); + if (!CONSP (last_command_event)) + kset_last_repeatable_command (current_kboard, Vreal_this_command); + + this_command_key_count = 0; + this_single_command_key_start = 0; + + if (current_kboard->immediate_echo + && !NILP (call0 (Qinternal_echo_keystrokes_prefix))) { - kset_last_command (current_kboard, Vthis_command); - kset_real_last_command (current_kboard, Vreal_this_command); - if (!CONSP (last_command_event)) - kset_last_repeatable_command (current_kboard, Vreal_this_command); - cancel_echoing (); - this_command_key_count = 0; - this_command_key_count_reset = false; - this_single_command_key_start = 0; + current_kboard->immediate_echo = false; + /* Refresh the echo message. */ + echo_now (); } + else + cancel_echoing (); if (!NILP (BVAR (current_buffer, mark_active)) && !NILP (Vrun_hooks)) @@ -2389,10 +2311,6 @@ read_char (int commandflag, Lisp_Object map, also_record = Qnil; -#if 0 /* This was commented out as part of fixing echo for C-u left. */ - before_command_key_count = this_command_key_count; - before_command_echo_length = echo_length (); -#endif c = Qnil; previous_echo_area_message = Qnil; @@ -2471,8 +2389,6 @@ read_char (int commandflag, Lisp_Object map, goto reread_for_input_method; } - this_command_key_count_reset = false; - if (!NILP (Vexecuting_kbd_macro)) { /* We set this to Qmacro; since that's not a frame, nobody will @@ -2570,7 +2486,7 @@ read_char (int commandflag, Lisp_Object map, (3) There's only one place in 20.x where ok_to_echo_at_next_pause is set to a non-null value. This is done in read_char and it is - set to echo_area_glyphs after a call to echo_char. That means + set to echo_area_glyphs. That means ok_to_echo_at_next_pause is either null or current_kboard->echobuf with the appropriate current_kboard at that time. @@ -2674,7 +2590,8 @@ read_char (int commandflag, Lisp_Object map, if (minibuf_level == 0 && !end_time && !current_kboard->immediate_echo - && this_command_key_count > 0 + && (this_command_key_count > 0 + || !NILP (call0 (Qinternal_echo_keystrokes_prefix))) && ! noninteractive && echo_keystrokes_p () && (/* No message. */ @@ -3018,7 +2935,6 @@ read_char (int commandflag, Lisp_Object map, { Lisp_Object keys; ptrdiff_t key_count; - bool key_count_reset; ptrdiff_t command_key_start; ptrdiff_t count = SPECPDL_INDEX (); @@ -3028,20 +2944,8 @@ read_char (int commandflag, Lisp_Object map, Lisp_Object saved_echo_string = KVAR (current_kboard, echo_string); ptrdiff_t saved_echo_after_prompt = current_kboard->echo_after_prompt; -#if 0 - if (before_command_restore_flag) - { - this_command_key_count = before_command_key_count_1; - if (this_command_key_count < this_single_command_key_start) - this_single_command_key_start = this_command_key_count; - echo_truncate (before_command_echo_length_1); - before_command_restore_flag = 0; - } -#endif - /* Save the this_command_keys status. */ key_count = this_command_key_count; - key_count_reset = this_command_key_count_reset; command_key_start = this_single_command_key_start; if (key_count > 0) @@ -3051,7 +2955,6 @@ read_char (int commandflag, Lisp_Object map, /* Clear out this_command_keys. */ this_command_key_count = 0; - this_command_key_count_reset = false; this_single_command_key_start = 0; /* Now wipe the echo area. */ @@ -3075,7 +2978,6 @@ read_char (int commandflag, Lisp_Object map, /* Restore the saved echoing state and this_command_keys state. */ this_command_key_count = key_count; - this_command_key_count_reset = key_count_reset; this_single_command_key_start = command_key_start; if (key_count > 0) this_command_keys = keys; @@ -3141,28 +3043,23 @@ read_char (int commandflag, Lisp_Object map, goto retry; } - if ((! reread || this_command_key_count == 0 - || this_command_key_count_reset) + if ((! reread || this_command_key_count == 0) && !end_time) { /* Don't echo mouse motion events. */ - if (echo_keystrokes_p () - && ! (EVENT_HAS_PARAMETERS (c) - && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qmouse_movement))) - { - echo_char (c); - if (! NILP (also_record)) - echo_char (also_record); - /* Once we reread a character, echoing can happen - the next time we pause to read a new one. */ - ok_to_echo_at_next_pause = current_kboard; - } + if (! (EVENT_HAS_PARAMETERS (c) + && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qmouse_movement))) + /* Once we reread a character, echoing can happen + the next time we pause to read a new one. */ + ok_to_echo_at_next_pause = current_kboard; /* Record this character as part of the current key. */ add_command_key (c); if (! NILP (also_record)) add_command_key (also_record); + + echo_update (); } last_input_event = c; @@ -3218,23 +3115,13 @@ record_menu_key (Lisp_Object c) record_char (c); -#if 0 - before_command_key_count = this_command_key_count; - before_command_echo_length = echo_length (); -#endif - - /* Don't echo mouse motion events. */ - if (echo_keystrokes_p ()) - { - echo_char (c); - - /* Once we reread a character, echoing can happen - the next time we pause to read a new one. */ - ok_to_echo_at_next_pause = 0; - } + /* Once we reread a character, echoing can happen + the next time we pause to read a new one. */ + ok_to_echo_at_next_pause = NULL; /* Record this character as part of the current key. */ add_command_key (c); + echo_update (); /* Re-reading in the middle of a command. */ last_input_event = c; @@ -9120,11 +9007,12 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, { key = keybuf[t]; add_command_key (key); - if (echo_keystrokes_p () - && current_kboard->immediate_echo) + if (current_kboard->immediate_echo) { - echo_add_key (key); - echo_dash (); + /* Set immediate_echo to false so as to force echo_now to + redisplay (it will set immediate_echo right back to true). */ + current_kboard->immediate_echo = false; + echo_now (); } } @@ -9788,11 +9676,8 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, Better ideas? */ for (; t < mock_input; t++) - { - if (echo_keystrokes_p ()) - echo_char (keybuf[t]); - add_command_key (keybuf[t]); - } + add_command_key (keybuf[t]); + echo_update (); return t; } @@ -9819,7 +9704,6 @@ read_key_sequence_vs (Lisp_Object prompt, Lisp_Object continue_echo, if (NILP (continue_echo)) { this_command_key_count = 0; - this_command_key_count_reset = false; this_single_command_key_start = 0; } @@ -10076,33 +9960,6 @@ The value is always a vector. */) return Fvector (raw_keybuf_count, XVECTOR (raw_keybuf)->contents); } -DEFUN ("reset-this-command-lengths", Freset_this_command_lengths, - Sreset_this_command_lengths, 0, 0, 0, - doc: /* Make the unread events replace the last command and echo. -Used in `universal-argument-other-key'. - -`universal-argument-other-key' rereads the event just typed. -It then gets translated through `function-key-map'. -The translated event has to replace the real events, -both in the value of (this-command-keys) and in echoing. -To achieve this, `universal-argument-other-key' calls -`reset-this-command-lengths', which discards the record of reading -these events the first time. */) - (void) -{ - this_command_key_count = before_command_key_count; - if (this_command_key_count < this_single_command_key_start) - this_single_command_key_start = this_command_key_count; - - echo_truncate (before_command_echo_length); - - /* Cause whatever we put into unread-command-events - to echo as if it were being freshly read from the keyboard. */ - this_command_key_count_reset = true; - - return Qnil; -} - DEFUN ("clear-this-command-keys", Fclear_this_command_keys, Sclear_this_command_keys, 0, 1, 0, doc: /* Clear out the vector that `this-command-keys' returns. @@ -10113,7 +9970,6 @@ KEEP-RECORD is non-nil. */) int i; this_command_key_count = 0; - this_command_key_count_reset = false; if (NILP (keep_record)) { @@ -11210,6 +11066,7 @@ syms_of_keyboard (void) staticpro (&raw_keybuf); DEFSYM (Qcommand_execute, "command-execute"); + DEFSYM (Qinternal_echo_keystrokes_prefix, "internal-echo-keystrokes-prefix"); accent_key_syms = Qnil; staticpro (&accent_key_syms); @@ -11253,7 +11110,6 @@ syms_of_keyboard (void) defsubr (&Sthis_command_keys_vector); defsubr (&Sthis_single_command_keys); defsubr (&Sthis_single_command_raw_keys); - defsubr (&Sreset_this_command_lengths); defsubr (&Sclear_this_command_keys); defsubr (&Ssuspend_emacs); defsubr (&Sabort_recursive_edit); commit afe1cf00713847c1d8f3a9d95d4980d705ec39f1 Author: Paul Eggert Date: Tue Sep 1 17:25:39 2015 -0700 Rework quoting in tutorial * doc/lispintro/emacs-lisp-intro.texi (Sample let Expression) (if in more detail, type-of-animal in detail, else): Rework the early example to use " rather than ' so that we don’t burden complete novices with the low-priority detail of text quoting style. (Complete zap-to-char, kill-region, Complete copy-region-as-kill) (kill-new function, kill-ring-yank-pointer) (Complete forward-sentence, Loading Files) (Code for current-kill, Code for current-kill, yank): Resurrect the Emacs 22 versions of the code, which uses grave quoting style in doc strings. (Complete zap-to-char): Mention how quoting works in doc strings. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index a27a969..3ac2418 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -3691,26 +3691,26 @@ to the two variables @code{zebra} and @code{tiger}. The body of the @smallexample @group -(let ((zebra 'stripes) - (tiger 'fierce)) +(let ((zebra "stripes") + (tiger "fierce")) (message "One kind of animal has %s and another is %s." zebra tiger)) @end group @end smallexample -Here, the varlist is @code{((zebra 'stripes) (tiger 'fierce))}. +Here, the varlist is @code{((zebra "stripes") (tiger "fierce"))}. The two variables are @code{zebra} and @code{tiger}. Each variable is the first element of a two-element list and each value is the second element of its two-element list. In the varlist, Emacs binds the -variable @code{zebra} to the value @code{stripes}@footnote{According +variable @code{zebra} to the value @code{"stripes"}@footnote{According to Jared Diamond in @cite{Guns, Germs, and Steel}, ``@dots{} zebras become impossibly dangerous as they grow older'' but the claim here is that they do not become fierce like a tiger. (1997, W. W. Norton and Co., ISBN 0-393-03894-2, page 171)}, and binds the -variable @code{tiger} to the value @code{fierce}. In this example, -both values are symbols preceded by a quote. The values could just as -well have been another list or a string. The body of the @code{let} +variable @code{tiger} to the value @code{"fierce"}. In this example, +both values are strings. The values could just as well have been +another list or a symbol. The body of the @code{let} follows after the list holding the variables. In this example, the body is a list that uses the @code{message} function to print a string in the echo area. @@ -3855,17 +3855,17 @@ of time, we would not need to run the test!) For example, the value may be bound to an argument of a function definition. In the following function definition, the character of the animal is a value that is passed to the function. If the value bound to -@code{characteristic} is @code{fierce}, then the message, @samp{It's a +@code{characteristic} is @code{"fierce"}, then the message, @samp{It is a tiger!} will be printed; otherwise, @code{nil} will be returned. @smallexample @group (defun type-of-animal (characteristic) "Print message in echo area depending on CHARACTERISTIC. -If the CHARACTERISTIC is the symbol ‘fierce’, +If the CHARACTERISTIC is the string \"fierce\", then warn of a tiger." - (if (equal characteristic 'fierce) - (message "It’s a tiger!"))) + (if (equal characteristic "fierce") + (message "It is a tiger!"))) @end group @end smallexample @@ -3877,18 +3877,18 @@ can evaluate the following two expressions to see the results: @smallexample @group -(type-of-animal 'fierce) +(type-of-animal "fierce") -(type-of-animal 'zebra) +(type-of-animal "striped") @end group @end smallexample @c Following sentences rewritten to prevent overfull hbox. @noindent -When you evaluate @code{(type-of-animal 'fierce)}, you will see the -following message printed in the echo area: @code{"It’s a tiger!"}; and -when you evaluate @code{(type-of-animal 'zebra)} you will see @code{nil} +When you evaluate @code{(type-of-animal "fierce")}, you will see the +following message printed in the echo area: @code{"It is a tiger!"}; and +when you evaluate @code{(type-of-animal "striped")} you will see @code{nil} printed in the echo area. @node type-of-animal in detail @@ -3918,7 +3918,7 @@ The parts of the function that match this template look like this: @group (defun type-of-animal (characteristic) "Print message in echo area depending on CHARACTERISTIC. -If the CHARACTERISTIC is the symbol ‘fierce’, +If the CHARACTERISTIC is the string \"fierce\", then warn of a tiger." @var{body: the} @code{if} @var{expression}) @end group @@ -3947,8 +3947,8 @@ looks like this: @smallexample @group -(if (equal characteristic 'fierce) - (message "It’s a tiger!"))) +(if (equal characteristic "fierce") + (message "It is a tiger!"))) @end group @end smallexample @@ -3956,26 +3956,26 @@ looks like this: Here, the true-or-false-test is the expression: @smallexample -(equal characteristic 'fierce) +(equal characteristic "fierce") @end smallexample @noindent In Lisp, @code{equal} is a function that determines whether its first argument is equal to its second argument. The second argument is the -quoted symbol @code{'fierce} and the first argument is the value of the +string @code{"fierce"} and the first argument is the value of the symbol @code{characteristic}---in other words, the argument passed to this function. In the first exercise of @code{type-of-animal}, the argument -@code{fierce} is passed to @code{type-of-animal}. Since @code{fierce} -is equal to @code{fierce}, the expression, @code{(equal characteristic -'fierce)}, returns a value of true. When this happens, the @code{if} +@code{"fierce"} is passed to @code{type-of-animal}. Since @code{"fierce"} +is equal to @code{"fierce"}, the expression, @code{(equal characteristic +"fierce")}, returns a value of true. When this happens, the @code{if} evaluates the second argument or then-part of the @code{if}: -@code{(message "It’s a tiger!")}. +@code{(message "It is a tiger!")}. On the other hand, in the second exercise of @code{type-of-animal}, the -argument @code{zebra} is passed to @code{type-of-animal}. @code{zebra} -is not equal to @code{fierce}, so the then-part is not evaluated and +argument @code{"striped"} is passed to @code{type-of-animal}. @code{"striped"} +is not equal to @code{"fierce"}, so the then-part is not evaluated and @code{nil} is returned by the @code{if} expression. @node else @@ -4034,33 +4034,33 @@ arguments to the function. @group (defun type-of-animal (characteristic) ; @r{Second version.} "Print message in echo area depending on CHARACTERISTIC. -If the CHARACTERISTIC is the symbol ‘fierce’, -then warn of a tiger; else say it’s not fierce." - (if (equal characteristic 'fierce) - (message "It’s a tiger!") - (message "It’s not fierce!"))) +If the CHARACTERISTIC is the string \"fierce\", +then warn of a tiger; else say it is not fierce." + (if (equal characteristic "fierce") + (message "It is a tiger!") + (message "It is not fierce!"))) @end group @end smallexample @sp 1 @smallexample @group -(type-of-animal 'fierce) +(type-of-animal "fierce") -(type-of-animal 'zebra) +(type-of-animal "striped") @end group @end smallexample @c Following sentence rewritten to prevent overfull hbox. @noindent -When you evaluate @code{(type-of-animal 'fierce)}, you will see the -following message printed in the echo area: @code{"It’s a tiger!"}; but -when you evaluate @code{(type-of-animal 'zebra)}, you will see -@code{"It’s not fierce!"}. +When you evaluate @code{(type-of-animal "fierce")}, you will see the +following message printed in the echo area: @code{"It is a tiger!"}; but +when you evaluate @code{(type-of-animal "striped")}, you will see +@code{"It is not fierce!"}. -(Of course, if the @var{characteristic} were @code{ferocious}, the -message @code{"It’s not fierce!"} would be printed; and it would be +(Of course, if the @var{characteristic} were @code{"ferocious"}, the +message @code{"It is not fierce!"} would be printed; and it would be misleading! When you write code, you need to take into account the possibility that some such argument will be tested by the @code{if} and write your program accordingly.) @@ -6348,7 +6348,7 @@ With arg N, put point N/10 of the way from the true beginning. @end group @group -Don’t use this in Lisp programs! +Don't use this in Lisp programs! \(goto-char (point-min)) is faster and does not set the mark." (interactive "P") @@ -7604,8 +7604,8 @@ Here is the complete text of the version 22 implementation of the function: @smallexample @group (defun zap-to-char (arg char) - "Kill up to and including ARG’th occurrence of CHAR. -Case is ignored if ‘case-fold-search’ is non-nil in the current buffer. + "Kill up to and including ARG'th occurrence of CHAR. +Case is ignored if `case-fold-search' is non-nil in the current buffer. Goes backward if ARG is negative; error if CHAR not found." (interactive "p\ncZap to char: ") (if (char-table-p translation-table-for-input) @@ -7620,6 +7620,19 @@ Goes backward if ARG is negative; error if CHAR not found." The documentation is thorough. You do need to know the jargon meaning of the word ``kill''. +@cindex curved quotes +@cindex curly quotes +The version 22 documentation string for @code{zap-to-char} uses ASCII +grave accent and apostrophe to quote a symbol, so it appears as +@t{`case-fold-search'}. This quoting style was inspired by 1970s-era +displays in which grave accent and apostrophe were often mirror images +suitable for use as quotes. On most modern displays this is no longer +true, and when these two ASCII characters appear in documentation +strings or diagnostic message formats, Emacs typically transliterates +them to curved single quotes, so that the abovequoted symbol appears +as @t{‘case-fold-search’}. Source-code strings can also simply use +curved quotes directly. + @node zap-to-char interactive @subsection The @code{interactive} Expression @@ -7863,7 +7876,7 @@ to make one entry in the kill ring. In Lisp code, optional third arg YANK-HANDLER, if non-nil, specifies the yank-handler text property to be set on the killed -text. See ‘insert-for-yank’." +text. See `insert-for-yank'." ;; Pass point first, then mark, because the order matters ;; when calling kill-append. (interactive (list (point) (mark))) @@ -8291,9 +8304,9 @@ function: @smallexample @group (defun copy-region-as-kill (beg end) - "Save the region as if killed, but don’t kill it. + "Save the region as if killed, but don't kill it. In Transient Mark mode, deactivate the mark. -If ‘interprogram-cut-function’ is non-nil, also save the text for a window +If `interprogram-cut-function' is non-nil, also save the text for a window system cut and paste." (interactive "r") @end group @@ -8573,28 +8586,16 @@ function which in turn uses the @code{setcar} function. @unnumberedsubsubsec The @code{kill-new} function @findex kill-new -@c in GNU Emacs 22, additional documentation to kill-new: -@ignore -Optional third arguments YANK-HANDLER controls how the STRING is later -inserted into a buffer; see `insert-for-yank' for details. -When a yank handler is specified, STRING must be non-empty (the yank -handler, if non-nil, is stored as a `yank-handler' text property on STRING). - -When the yank handler has a non-nil PARAM element, the original STRING -argument is not used by `insert-for-yank'. However, since Lisp code -may access and use elements from the kill ring directly, the STRING -argument should still be a \"useful\" string for such uses." -@end ignore @need 1200 -The @code{kill-new} function looks like this: +In version 22 the @code{kill-new} function looks like this: @smallexample @group (defun kill-new (string &optional replace yank-handler) "Make STRING the latest kill in the kill ring. -Set ‘kill-ring-yank-pointer’ to point to it. +Set `kill-ring-yank-pointer' to point to it. -If `interprogram-cut-function’ is non-nil, apply it to STRING. +If `interprogram-cut-function' is non-nil, apply it to STRING. Optional second argument REPLACE non-nil means that STRING will replace the front of the kill ring, rather than being added to the list. @dots{}" @@ -10089,10 +10090,10 @@ With argument, rotate that many kills forward (or backward, if negative)." (defun current-kill (n &optional do-not-move) "Rotate the yanking point by N places, and then return that kill. -If N is zero, ‘interprogram-paste-function’ is set, and calling it +If N is zero, `interprogram-paste-function' is set, and calling it returns a string, then that string is added to the front of the kill ring and returned as the latest kill. -If optional arg DO-NOT-MOVE is non-nil, then don’t actually move the +If optional arg DO-NOT-MOVE is non-nil, then don't actually move the yanking point; just return the Nth kill forward." (let ((interprogram-paste (and (= n 0) interprogram-paste-function @@ -12427,10 +12428,10 @@ Here is the code for @code{forward-sentence}: @smallexample @group (defun forward-sentence (&optional arg) - "Move forward to next ‘sentence-end’. With argument, repeat. -With negative argument, move backward repeatedly to ‘sentence-beginning’. + "Move forward to next end of sentence. With argument, repeat. +With negative argument, move backward repeatedly to start of sentence. -The variable ‘sentence-end’ is a regular expression that matches ends of +The variable `sentence-end' is a regular expression that matches ends of sentences. Also, every paragraph boundary terminates sentences as well." @end group @group @@ -17520,8 +17521,13 @@ Incidentally, @code{load-library} is an interactive interface to the @smallexample @group (defun load-library (library) - "Load the library named LIBRARY. -This is an interface to the function ‘load’." + "Load the Emacs Lisp library named LIBRARY. +This is an interface to the function `load'. LIBRARY is searched +for in `load-path', both with and without `load-suffixes' (as +well as `load-file-rep-suffixes'). + +See Info node `(emacs)Lisp Libraries' for more details. +See `load-file' for a different interface to `load'." (interactive (list (completing-read "Load library: " (apply-partially 'locate-file-completion-table @@ -19005,13 +19011,21 @@ The @code{current-kill} function is used by @code{yank} and by @group (defun current-kill (n &optional do-not-move) "Rotate the yanking point by N places, and then return that kill. -If N is zero, ‘interprogram-paste-function’ is set, and calling it -returns a string, then that string is added to the front of the -kill ring and returned as the latest kill. +If N is zero and `interprogram-paste-function' is set to a +function that returns a string or a list of strings, and if that +function doesn't return nil, then that string (or list) is added +to the front of the kill ring and the string (or first string in +the list) is returned as the latest kill. @end group @group -If optional arg DO-NOT-MOVE is non-nil, then don’t actually move the -yanking point; just return the Nth kill forward." +If N is not zero, and if `yank-pop-change-selection' is +non-nil, use `interprogram-cut-function' to transfer the +kill at the new yank point into the window system selection. +@end group +@group +If optional arg DO-NOT-MOVE is non-nil, then don't actually +move the yanking point; just return the Nth kill forward." + (let ((interprogram-paste (and (= n 0) interprogram-paste-function (funcall interprogram-paste-function)))) @@ -19023,8 +19037,10 @@ yanking point; just return the Nth kill forward." ;; text to the kill ring, so Emacs doesn't try to own the ;; selection, with identical text. (let ((interprogram-cut-function nil)) - (kill-new interprogram-paste)) - interprogram-paste) + (if (listp interprogram-paste) + (mapc 'kill-new (nreverse interprogram-paste)) + (kill-new interprogram-paste))) + (car kill-ring)) @end group @group (or kill-ring (error "Kill ring is empty")) @@ -19032,8 +19048,12 @@ yanking point; just return the Nth kill forward." (nthcdr (mod (- n (length kill-ring-yank-pointer)) (length kill-ring)) kill-ring))) - (or do-not-move - (setq kill-ring-yank-pointer ARGth-kill-element)) + (unless do-not-move + (setq kill-ring-yank-pointer ARGth-kill-element) + (when (and yank-pop-change-selection + (> n 0) + interprogram-cut-function) + (funcall interprogram-cut-function (car ARGth-kill-element)))) (car ARGth-kill-element))))) @end group @end smallexample @@ -19344,15 +19364,15 @@ The code looks like this: "Reinsert (\"paste\") the last stretch of killed text. More precisely, reinsert the stretch of killed text most recently killed OR yanked. Put point at end, and set mark at beginning. -With just \\[universal-argument] as argument, same but put point at -beginning (and mark at end). With argument N, reinsert the Nth most -recently killed stretch of killed text. +With just \\[universal-argument] as argument, same but put point at beginning (and mark at end). +With argument N, reinsert the Nth most recently killed stretch of killed +text. When this command inserts killed text into the buffer, it honors -‘yank-excluded-properties’ and ‘yank-handler’ as described in the -doc string for ‘insert-for-yank-1’, which see. +`yank-excluded-properties' and `yank-handler' as described in the +doc string for `insert-for-yank-1', which see. -See also the command \\[yank-pop]." +See also the command `yank-pop' (\\[yank-pop])." @end group @group (interactive "*P") @@ -19368,8 +19388,7 @@ See also the command \\[yank-pop]." ((eq arg '-) -2) (t (1- arg))))) (if (consp arg) - ;; This is like exchange-point-and-mark, - ;; but doesn't activate the mark. + ;; This is like exchange-point-and-mark, but doesn't activate the mark. ;; It is cleaner to avoid activation, even though the command ;; loop would deactivate the mark because we inserted text. (goto-char (prog1 (mark t) commit 72aae7326b8e2264eb02e8f9725a367f62aa09fd Author: Paul Eggert Date: Tue Sep 1 16:53:08 2015 -0700 Setup quote display only if interactive * lisp/startup.el (command-line): Skip call to startup--setup-quote-display if noninteractive. Without this change, python-shell-prompt-validate-regexps-1 fails in test/automated/python-tests.el when run in an en_US.utf8 locale on Fedora. diff --git a/lisp/startup.el b/lisp/startup.el index 2f90c8d..b5e258f 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1026,8 +1026,9 @@ please check its value") '("no" "off" "false" "0"))))) (setq no-blinking-cursor t)) - (startup--setup-quote-display) - (setq internal--text-quoting-flag t) + (unless noninteractive + (startup--setup-quote-display) + (setq internal--text-quoting-flag t)) ;; Re-evaluate predefined variables whose initial value depends on ;; the runtime context. commit fea1e883c49687324e627f81841a80cdb25c41f5 Author: Katsumi Yamaoka Date: Tue Sep 1 22:59:53 2015 +0000 Use defalias at the top level * lisp/gnus/gnus-util.el (gnus-format-message): * lisp/net/tls.el (tls-format-message): Use defalias at the top level so as to make eval-and-compile unnecessary. Thanks to Stefan Monnier. diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 54cf099..215eac8 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1974,10 +1974,10 @@ to case differences." (string-equal (downcase str1) (downcase prefix)) (string-equal str1 prefix)))))) -(if (fboundp 'format-message) - (defalias 'gnus-format-message 'format-message) - ;; for Emacs < 25, and XEmacs, don't worry about quote translation. - (defalias 'gnus-format-message 'format)) +(defalias 'gnus-format-message + (if (fboundp 'format-message) 'format-message + ;; for Emacs < 25, and XEmacs, don't worry about quote translation. + 'format)) ;; Simple check: can be a macro but this way, although slow, it's really clear. ;; We don't use `bound-and-true-p' because it's not in XEmacs. diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 46891be..544aec5 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -174,11 +174,10 @@ Used by `tls-certificate-information'." :type 'string :group 'tls) -(eval-and-compile - (if (fboundp 'format-message) - (defalias 'tls-format-message 'format-message) +(defalias 'tls-format-message + (if (fboundp 'format-message) 'format-message ;; for Emacs < 25, and XEmacs, don't worry about quote translation. - (defalias 'tls-format-message 'format))) + 'format)) (defun tls-certificate-information (der) "Parse X.509 certificate in DER format into an assoc list." commit 183ad9d59757314f93aed8a9fe512c8fb48a2ed1 Author: Paul Eggert Date: Tue Sep 1 12:06:00 2015 -0700 terminal-init-w32console mimicks command-line Problem reported by Eli Zaretskii. * lisp/startup.el (startup--setup-quote-display): New function, refactored from a part of ‘command-line’. (command-line): Use it. * lisp/term/w32console.el (terminal-init-w32console): Use it, so that this function stays consistent with ‘command-line’. diff --git a/lisp/startup.el b/lisp/startup.el index 3e29739..2f90c8d 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -803,6 +803,15 @@ to prepare for opening the first frame (e.g. open a connection to an X server)." (defvar server-name) (defvar server-process) +(defun startup--setup-quote-display () + "If curved quotes don't work, display ASCII approximations." + (dolist (char-repl '((?‘ . ?\`) (?’ . ?\') (?“ . ?\") (?” . ?\"))) + (when (not (char-displayable-p (car char-repl))) + (unless standard-display-table + (setq standard-display-table (make-display-table))) + (aset standard-display-table (car char-repl) + (vector (make-glyph-code (cdr char-repl) 'shadow)))))) + (defun command-line () "A subroutine of `normal-top-level'. Amongst another things, it parses the command-line arguments." @@ -1017,13 +1026,7 @@ please check its value") '("no" "off" "false" "0"))))) (setq no-blinking-cursor t)) - ;; If curved quotes don't work, display ASCII approximations. - (dolist (char-repl '((?‘ . ?\`) (?’ . ?\') (?“ . ?\") (?” . ?\"))) - (when (not (char-displayable-p (car char-repl))) - (or standard-display-table - (setq standard-display-table (make-display-table))) - (aset standard-display-table (car char-repl) - (vector (make-glyph-code (cdr char-repl) 'shadow))))) + (startup--setup-quote-display) (setq internal--text-quoting-flag t) ;; Re-evaluate predefined variables whose initial value depends on diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el index 2df1378..5885685 100644 --- a/lisp/term/w32console.el +++ b/lisp/term/w32console.el @@ -68,12 +68,7 @@ (if oem-o-cs-p oem-code-page-output-coding oem-code-page-coding)) ;; Since we changed the terminal encoding, we need to repeat ;; the test for Unicode quotes being displayable. - (dolist (char-repl - '((?‘ . [?\`]) (?’ . [?\']) (?“ . [?\"]) (?” . [?\"]))) - (when (not (char-displayable-p (car char-repl))) - (or standard-display-table - (setq standard-display-table (make-display-table))) - (aset standard-display-table (car char-repl) (cdr char-repl)))))) + (startup--setup-quote-display))) (let* ((colors w32-tty-standard-colors) (color (car colors))) (tty-color-clear) commit 1a3518e7c361a9ceaa017c1334a83d14e0651a4e Author: Paul Eggert Date: Tue Sep 1 09:18:12 2015 -0700 Display replacement quotes with shadow glyphs * lisp/startup.el (command-line): When displaying ASCII replacements for curved quotes, use a shadow glyph instead of a regular one, to avoid ambiguity. diff --git a/lisp/startup.el b/lisp/startup.el index 8c63ed2..3e29739 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1018,11 +1018,12 @@ please check its value") (setq no-blinking-cursor t)) ;; If curved quotes don't work, display ASCII approximations. - (dolist (char-repl '((?‘ . [?\`]) (?’ . [?\']) (?“ . [?\"]) (?” . [?\"]))) + (dolist (char-repl '((?‘ . ?\`) (?’ . ?\') (?“ . ?\") (?” . ?\"))) (when (not (char-displayable-p (car char-repl))) (or standard-display-table (setq standard-display-table (make-display-table))) - (aset standard-display-table (car char-repl) (cdr char-repl)))) + (aset standard-display-table (car char-repl) + (vector (make-glyph-code (cdr char-repl) 'shadow))))) (setq internal--text-quoting-flag t) ;; Re-evaluate predefined variables whose initial value depends on commit da88ad6cb1e98ef9f28462648ab53d81d22dd189 Author: Michael Albinus Date: Tue Sep 1 16:31:06 2015 +0200 * lisp/net/tramp-sh.el (tramp-methods) : Mask "Password:". diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 5f96b92..79b024e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -288,10 +288,10 @@ The string is used in `tramp-methods'.") (add-to-list 'tramp-methods '("sudo" (tramp-login-program "sudo") - ;; The password template must not be the last argument. - ;; Otherwise, it could be interpreted as password prompt if the - ;; remote host echoes the command. - (tramp-login-args (("-p" "Password:") ("-u" "%u") ("-s") ("-H"))) + ;; The password template must be masked. Otherwise, it could be + ;; interpreted as password prompt if the remote host echoes the command. + (tramp-login-args (("-u" "%u") ("-s") ("-H") + ("-p" "P\"\"a\"\"s\"\"s\"\"w\"\"o\"\"r\"\"d\"\":"))) ;; Local $SHELL could be a nasty one, like zsh or fish. Let's override it. (tramp-login-env (("SHELL") ("/bin/sh"))) (tramp-remote-shell "/bin/sh") commit a3c31adea4970b8a7fc7f495e6a6a6d4a93e69ce Author: Paul Eggert Date: Tue Sep 1 06:21:25 2015 -0700 Docstring fixes re quotes in C code Fix some docstring quoting problems, mostly by escaping apostrophe. diff --git a/src/buffer.c b/src/buffer.c index fc2ee82..33f7996 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5402,140 +5402,140 @@ syms_of_buffer (void) DEFVAR_BUFFER_DEFAULTS ("default-mode-line-format", mode_line_format, doc: /* Default value of `mode-line-format' for buffers that don't override it. -This is the same as (default-value 'mode-line-format). */); +This is the same as (default-value \\='mode-line-format). */); DEFVAR_BUFFER_DEFAULTS ("default-header-line-format", header_line_format, doc: /* Default value of `header-line-format' for buffers that don't override it. -This is the same as (default-value 'header-line-format). */); +This is the same as (default-value \\='header-line-format). */); DEFVAR_BUFFER_DEFAULTS ("default-cursor-type", cursor_type, doc: /* Default value of `cursor-type' for buffers that don't override it. -This is the same as (default-value 'cursor-type). */); +This is the same as (default-value \\='cursor-type). */); DEFVAR_BUFFER_DEFAULTS ("default-line-spacing", extra_line_spacing, doc: /* Default value of `line-spacing' for buffers that don't override it. -This is the same as (default-value 'line-spacing). */); +This is the same as (default-value \\='line-spacing). */); DEFVAR_BUFFER_DEFAULTS ("default-cursor-in-non-selected-windows", cursor_in_non_selected_windows, doc: /* Default value of `cursor-in-non-selected-windows'. -This is the same as (default-value 'cursor-in-non-selected-windows). */); +This is the same as (default-value \\='cursor-in-non-selected-windows). */); DEFVAR_BUFFER_DEFAULTS ("default-abbrev-mode", abbrev_mode, doc: /* Default value of `abbrev-mode' for buffers that do not override it. -This is the same as (default-value 'abbrev-mode). */); +This is the same as (default-value \\='abbrev-mode). */); DEFVAR_BUFFER_DEFAULTS ("default-ctl-arrow", ctl_arrow, doc: /* Default value of `ctl-arrow' for buffers that do not override it. -This is the same as (default-value 'ctl-arrow). */); +This is the same as (default-value \\='ctl-arrow). */); DEFVAR_BUFFER_DEFAULTS ("default-enable-multibyte-characters", enable_multibyte_characters, doc: /* Default value of `enable-multibyte-characters' for buffers not overriding it. -This is the same as (default-value 'enable-multibyte-characters). */); +This is the same as (default-value \\='enable-multibyte-characters). */); DEFVAR_BUFFER_DEFAULTS ("default-buffer-file-coding-system", buffer_file_coding_system, doc: /* Default value of `buffer-file-coding-system' for buffers not overriding it. -This is the same as (default-value 'buffer-file-coding-system). */); +This is the same as (default-value \\='buffer-file-coding-system). */); DEFVAR_BUFFER_DEFAULTS ("default-truncate-lines", truncate_lines, doc: /* Default value of `truncate-lines' for buffers that do not override it. -This is the same as (default-value 'truncate-lines). */); +This is the same as (default-value \\='truncate-lines). */); DEFVAR_BUFFER_DEFAULTS ("default-fill-column", fill_column, doc: /* Default value of `fill-column' for buffers that do not override it. -This is the same as (default-value 'fill-column). */); +This is the same as (default-value \\='fill-column). */); DEFVAR_BUFFER_DEFAULTS ("default-left-margin", left_margin, doc: /* Default value of `left-margin' for buffers that do not override it. -This is the same as (default-value 'left-margin). */); +This is the same as (default-value \\='left-margin). */); DEFVAR_BUFFER_DEFAULTS ("default-tab-width", tab_width, doc: /* Default value of `tab-width' for buffers that do not override it. NOTE: This controls the display width of a TAB character, and not the size of an indentation step. -This is the same as (default-value 'tab-width). */); +This is the same as (default-value \\='tab-width). */); DEFVAR_BUFFER_DEFAULTS ("default-case-fold-search", case_fold_search, doc: /* Default value of `case-fold-search' for buffers that don't override it. -This is the same as (default-value 'case-fold-search). */); +This is the same as (default-value \\='case-fold-search). */); DEFVAR_BUFFER_DEFAULTS ("default-left-margin-width", left_margin_cols, doc: /* Default value of `left-margin-width' for buffers that don't override it. -This is the same as (default-value 'left-margin-width). */); +This is the same as (default-value \\='left-margin-width). */); DEFVAR_BUFFER_DEFAULTS ("default-right-margin-width", right_margin_cols, doc: /* Default value of `right-margin-width' for buffers that don't override it. -This is the same as (default-value 'right-margin-width). */); +This is the same as (default-value \\='right-margin-width). */); DEFVAR_BUFFER_DEFAULTS ("default-left-fringe-width", left_fringe_width, doc: /* Default value of `left-fringe-width' for buffers that don't override it. -This is the same as (default-value 'left-fringe-width). */); +This is the same as (default-value \\='left-fringe-width). */); DEFVAR_BUFFER_DEFAULTS ("default-right-fringe-width", right_fringe_width, doc: /* Default value of `right-fringe-width' for buffers that don't override it. -This is the same as (default-value 'right-fringe-width). */); +This is the same as (default-value \\='right-fringe-width). */); DEFVAR_BUFFER_DEFAULTS ("default-fringes-outside-margins", fringes_outside_margins, doc: /* Default value of `fringes-outside-margins' for buffers that don't override it. -This is the same as (default-value 'fringes-outside-margins). */); +This is the same as (default-value \\='fringes-outside-margins). */); DEFVAR_BUFFER_DEFAULTS ("default-scroll-bar-width", scroll_bar_width, doc: /* Default value of `scroll-bar-width' for buffers that don't override it. -This is the same as (default-value 'scroll-bar-width). */); +This is the same as (default-value \\='scroll-bar-width). */); DEFVAR_BUFFER_DEFAULTS ("default-vertical-scroll-bar", vertical_scroll_bar_type, doc: /* Default value of `vertical-scroll-bar' for buffers that don't override it. -This is the same as (default-value 'vertical-scroll-bar). */); +This is the same as (default-value \\='vertical-scroll-bar). */); DEFVAR_BUFFER_DEFAULTS ("default-indicate-empty-lines", indicate_empty_lines, doc: /* Default value of `indicate-empty-lines' for buffers that don't override it. -This is the same as (default-value 'indicate-empty-lines). */); +This is the same as (default-value \\='indicate-empty-lines). */); DEFVAR_BUFFER_DEFAULTS ("default-indicate-buffer-boundaries", indicate_buffer_boundaries, doc: /* Default value of `indicate-buffer-boundaries' for buffers that don't override it. -This is the same as (default-value 'indicate-buffer-boundaries). */); +This is the same as (default-value \\='indicate-buffer-boundaries). */); DEFVAR_BUFFER_DEFAULTS ("default-fringe-indicator-alist", fringe_indicator_alist, doc: /* Default value of `fringe-indicator-alist' for buffers that don't override it. -This is the same as (default-value 'fringe-indicator-alist). */); +This is the same as (default-value \\='fringe-indicator-alist). */); DEFVAR_BUFFER_DEFAULTS ("default-fringe-cursor-alist", fringe_cursor_alist, doc: /* Default value of `fringe-cursor-alist' for buffers that don't override it. -This is the same as (default-value 'fringe-cursor-alist). */); +This is the same as (default-value \\='fringe-cursor-alist). */); DEFVAR_BUFFER_DEFAULTS ("default-scroll-up-aggressively", scroll_up_aggressively, doc: /* Default value of `scroll-up-aggressively'. This value applies in buffers that don't have their own local values. -This is the same as (default-value 'scroll-up-aggressively). */); +This is the same as (default-value \\='scroll-up-aggressively). */); DEFVAR_BUFFER_DEFAULTS ("default-scroll-down-aggressively", scroll_down_aggressively, doc: /* Default value of `scroll-down-aggressively'. This value applies in buffers that don't have their own local values. -This is the same as (default-value 'scroll-down-aggressively). */); +This is the same as (default-value \\='scroll-down-aggressively). */); DEFVAR_PER_BUFFER ("header-line-format", &BVAR (current_buffer, header_line_format), diff --git a/src/data.c b/src/data.c index 784d127..88c5a30 100644 --- a/src/data.c +++ b/src/data.c @@ -1668,7 +1668,7 @@ this function causes a local value to exist for this buffer, just as setting the variable would do. This function returns VARIABLE, and therefore - (set (make-local-variable 'VARIABLE) VALUE-EXP) + (set (make-local-variable \\='VARIABLE) VALUE-EXP) works. See also `make-variable-buffer-local'. diff --git a/src/dired.c b/src/dired.c index e70f136..9773667 100644 --- a/src/dired.c +++ b/src/dired.c @@ -816,7 +816,7 @@ DEFUN ("file-attributes", Ffile_attributes, Sfile_attributes, 1, 2, 0, Value is nil if specified file cannot be opened. ID-FORMAT specifies the preferred format of attributes uid and gid (see -below) - valid values are 'string and 'integer. The latter is the +below) - valid values are `string' and `integer'. The latter is the default, but we plan to change that, so you should specify a non-nil value for ID-FORMAT if you use the returned uid or gid. diff --git a/src/editfns.c b/src/editfns.c index a85c9e7..e7d5dd8 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -2156,7 +2156,7 @@ applied without consideration for daylight saving time. You can pass more than 7 arguments; then the first six arguments are used as SECOND through YEAR, and the *last* argument is used as ZONE. The intervening arguments are ignored. -This feature lets (apply 'encode-time (decode-time ...)) work. +This feature lets (apply \\='encode-time (decode-time ...)) work. Out-of-range values for SECOND, MINUTE, HOUR, DAY, or MONTH are allowed; for example, a DAY of 0 means the day preceding the given month. diff --git a/src/eval.c b/src/eval.c index 6fde7e3..77d435a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -517,7 +517,7 @@ DEFUN ("quote", Fquote, Squote, 1, UNEVALLED, 0, Warning: `quote' does not construct its return value, but just returns the value that was pre-constructed by the Lisp reader (see info node `(elisp)Printed Representation'). -This means that '(a . b) is not identical to (cons 'a 'b): the former +This means that \\='(a . b) is not identical to (cons \\='a \\='b): the former does not cons. Quoting should be reserved for constants that will never be modified by side-effects, unless you like self-modifying code. See the common pitfall in info node `(elisp)Rearrangement' for an example @@ -2196,7 +2196,7 @@ eval_sub (Lisp_Object form) DEFUN ("apply", Fapply, Sapply, 1, MANY, 0, doc: /* Call FUNCTION with our remaining args, using our last arg as list of args. Then return the value FUNCTION returns. -Thus, (apply '+ 1 2 '(3 4)) returns 10. +Thus, (apply \\='+ 1 2 \\='(3 4)) returns 10. usage: (apply FUNCTION &rest ARGUMENTS) */) (ptrdiff_t nargs, Lisp_Object *args) { @@ -2557,7 +2557,7 @@ DEFUN ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0, DEFUN ("funcall", Ffuncall, Sfuncall, 1, MANY, 0, doc: /* Call first argument as a function, passing remaining arguments to it. Return the value that function returns. -Thus, (funcall 'cons 'x 'y) returns (x . y). +Thus, (funcall \\='cons \\='x \\='y) returns (x . y). usage: (funcall FUNCTION &rest ARGUMENTS) */) (ptrdiff_t nargs, Lisp_Object *args) { diff --git a/src/fileio.c b/src/fileio.c index a36dfbc..d4341f8 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5878,7 +5878,7 @@ the arguments that were passed to that primitive. For example, if you do (file-exists-p FILENAME) and FILENAME is handled by HANDLER, then HANDLER is called like this: - (funcall HANDLER 'file-exists-p FILENAME) + (funcall HANDLER \\='file-exists-p FILENAME) Note that HANDLER must be able to handle all I/O primitives; if it has nothing special to do for a primitive, it should reinvoke the diff --git a/src/fns.c b/src/fns.c index 26a98ab..aa917ac 100644 --- a/src/fns.c +++ b/src/fns.c @@ -347,7 +347,7 @@ This function obeys the conventions for collation order in your locale settings. For example, punctuation and whitespace characters might be considered less significant for sorting: -\(sort '\("11" "12" "1 1" "1 2" "1.1" "1.2") 'string-collate-lessp) +\(sort '\("11" "12" "1 1" "1 2" "1.1" "1.2") \\='string-collate-lessp) => \("11" "1 1" "1.1" "12" "1 2" "1.2") The optional argument LOCALE, a string, overrides the setting of your @@ -1083,7 +1083,7 @@ multibyte character of charset `eight-bit'. See also `string-to-multibyte'. Beware, this often doesn't really do what you think it does. -It is similar to (decode-coding-string STRING 'utf-8-emacs). +It is similar to (decode-coding-string STRING \\='utf-8-emacs). If you're not sure, whether to use `string-as-multibyte' or `string-to-multibyte', use `string-to-multibyte'. */) (Lisp_Object string) diff --git a/src/frame.c b/src/frame.c index d3e4780..6debcb8 100644 --- a/src/frame.c +++ b/src/frame.c @@ -976,7 +976,7 @@ except when you want to create a new frame on another terminal. In that case, the `tty' parameter specifies the device file to open, and the `tty-type' parameter specifies the terminal type. Example: - (make-terminal-frame '((tty . "/dev/pts/5") (tty-type . "xterm"))) + (make-terminal-frame \\='((tty . "/dev/pts/5") (tty-type . "xterm"))) Note that changing the size of one terminal frame automatically affects all frames on the same terminal device. */) @@ -5018,7 +5018,7 @@ You can also use a floating number between 0.0 and 1.0. */); DEFVAR_LISP ("default-frame-alist", Vdefault_frame_alist, doc: /* Alist of default values for frame creation. These may be set in your init file, like this: - (setq default-frame-alist '((width . 80) (height . 55) (menu-bar-lines . 1))) + (setq default-frame-alist \\='((width . 80) (height . 55) (menu-bar-lines . 1))) These override values given in window system configuration data, including X Windows' defaults database. For values specific to the first Emacs frame, see `initial-frame-alist'. @@ -5176,7 +5176,7 @@ width by the width of one scroll bar provided this option is nil and keep it unchanged if this option is either t or a list containing `vertical-scroll-bars'. -The default value is '(tool-bar-lines) on Lucid, Motif and Windows +The default value is \\='(tool-bar-lines) on Lucid, Motif and Windows \(which means that adding/removing a tool bar does not change the frame height), nil on all other window systems including GTK+ (which means that changing any of the parameters listed above may change the size of diff --git a/src/image.c b/src/image.c index 743d230..85cf801 100644 --- a/src/image.c +++ b/src/image.c @@ -9752,7 +9752,7 @@ syms_of_image (void) defining the supported image types. */ DEFVAR_LISP ("image-types", Vimage_types, doc: /* List of potentially supported image types. -Each element of the list is a symbol for an image type, like 'jpeg or 'png. +Each element of the list is a symbol for an image type, like `jpeg' or `png'. To check whether it is really supported, use `image-type-available-p'. */); Vimage_types = Qnil; diff --git a/src/keyboard.c b/src/keyboard.c index dab32b1..d7a533b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -754,7 +754,7 @@ force_auto_save_soon (void) DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "", doc: /* Invoke the editor command loop recursively. To get out of the recursive edit, a command can throw to ‘exit’ -- for -instance ‘(throw 'exit nil)’. +instance ‘(throw \\='exit nil)’. If you throw a value other than t, ‘recursive-edit’ returns normally to the function that called it. Throwing a t value causes ‘recursive-edit’ to quit, so that control returns to the command loop diff --git a/src/print.c b/src/print.c index d3b1a92..94f3fcd 100644 --- a/src/print.c +++ b/src/print.c @@ -2212,7 +2212,7 @@ This affects only `prin1'. */); DEFVAR_BOOL ("print-quoted", print_quoted, doc: /* Non-nil means print quoted forms with reader syntax. -I.e., (quote foo) prints as 'foo, (function foo) as #'foo. */); +I.e., (quote foo) prints as \\='foo, (function foo) as #\\='foo. */); print_quoted = 0; DEFVAR_LISP ("print-gensym", Vprint_gensym, diff --git a/src/process.c b/src/process.c index 17e9187..1ab8378 100644 --- a/src/process.c +++ b/src/process.c @@ -2685,7 +2685,7 @@ Examples: \(serial-process-configure :process "/dev/ttyS0" :speed 1200) \(serial-process-configure - :buffer "COM1" :stopbits 1 :parity 'odd :flowcontrol 'hw) + :buffer "COM1" :stopbits 1 :parity \\='odd :flowcontrol \\='hw) \(serial-process-configure :port "\\\\.\\COM13" :bytesize 7) @@ -2785,7 +2785,7 @@ Examples: \(make-serial-process :port "COM1" :speed 115200 :stopbits 2) -\(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity 'odd) +\(make-serial-process :port "\\\\.\\COM13" :speed 1200 :bytesize 7 :parity \\='odd) \(make-serial-process :port "/dev/tty.BlueConsole-SPP-1" :speed nil) diff --git a/src/w32fns.c b/src/w32fns.c index f279fb8..d8e22e2 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -5782,8 +5782,8 @@ Internal use only, use `display-monitor-attributes-list' instead. */) DEFUN ("set-message-beep", Fset_message_beep, Sset_message_beep, 1, 1, 0, doc: /* Set the sound generated when the bell is rung. -SOUND is 'asterisk, 'exclamation, 'hand, 'question, 'ok, or 'silent -to use the corresponding system sound for the bell. The 'silent sound +SOUND is `asterisk', `exclamation', `hand', `question', `ok', or `silent' +to use the corresponding system sound for the bell. The `silent' sound prevents Emacs from making any sound at all. SOUND is nil to use the normal beep. */) (Lisp_Object sound) diff --git a/src/xfaces.c b/src/xfaces.c index 556f361..d89adca 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6506,8 +6506,8 @@ If this variable is made buffer-local, the face remapping takes effect only in that buffer. For instance, the mode my-mode could define a face `my-mode-default', and then in the mode setup function, do: - (set (make-local-variable 'face-remapping-alist) - '((default my-mode-default)))). + (set (make-local-variable \\='face-remapping-alist) + \\='((default my-mode-default)))). Because Emacs normally only redraws screen areas when the underlying buffer contents change, you may need to call `redraw-display' after commit 447e5890a81f098881aecc099852ace466ef5925 Author: Michael Albinus Date: Tue Sep 1 14:57:39 2015 +0200 Some Tramp password fixes * lisp/net/tramp.el (tramp-clear-passwd): Clear also the passwords of the hops. * lisp/net/tramp-sh.el (tramp-methods) : Move "-p" "Password:" at the beginning of the command. Otherwise, it could be interpreted as password prompt if the remote host echoes the command. (tramp-remote-coding-commands): Add "openssl enc -base64". diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 8cae8dc..5f96b92 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -288,7 +288,10 @@ The string is used in `tramp-methods'.") (add-to-list 'tramp-methods '("sudo" (tramp-login-program "sudo") - (tramp-login-args (("-u" "%u") ("-s") ("-H") ("-p" "Password:"))) + ;; The password template must not be the last argument. + ;; Otherwise, it could be interpreted as password prompt if the + ;; remote host echoes the command. + (tramp-login-args (("-p" "Password:") ("-u" "%u") ("-s") ("-H"))) ;; Local $SHELL could be a nasty one, like zsh or fish. Let's override it. (tramp-login-env (("SHELL") ("/bin/sh"))) (tramp-remote-shell "/bin/sh") @@ -4316,6 +4319,7 @@ with the encoded or decoded results, respectively.") ;; However, I don't know whether all base64 versions do supports ;; this option. (b64 "base64" "base64 -d") + (b64 "openssl enc -base64" "openssl enc -d -base64") (b64 "mimencode -b" "mimencode -u -b") (b64 "mmencode -b" "mmencode -u -b") (b64 "recode data..base64" "recode base64..data") diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index bf3e1c7..6bafae0 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4258,6 +4258,16 @@ Invokes `password-read' if available, `read-passwd' else." ;;;###tramp-autoload (defun tramp-clear-passwd (vec) "Clear password cache for connection related to VEC." + (let ((hop (tramp-file-name-hop vec))) + (when hop + ;; Clear also the passwords of the hops. + (tramp-clear-passwd + (tramp-dissect-file-name + (concat + tramp-prefix-format + (tramp-compat-replace-regexp-in-string + (concat tramp-postfix-hop-regexp "$") + tramp-postfix-host-format hop)))))) (tramp-compat-funcall 'password-cache-remove (tramp-make-tramp-file-name commit 21d6414a4b0f37b2381859eeebf66908b6568c31 Author: Dmitry Gutov Date: Tue Sep 1 15:02:52 2015 +0300 Make vc-git-working-revision always return the commit hash * lisp/vc/vc-git.el (vc-git-working-revision): Return the commit hash (bug#21383). (vc-git--symbolic-ref): New function, extracted from above. (vc-git-mode-line-string): Use it. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 9522328..50c6d96 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -248,26 +248,30 @@ matching the resulting Git log output, and KEYWORDS is a list of (vc-git--state-code diff-letter))) (if (vc-git--empty-db-p) 'added 'up-to-date)))) -(defun vc-git-working-revision (file) +(defun vc-git-working-revision (_file) "Git-specific version of `vc-working-revision'." - (let* (process-file-side-effects - (str (vc-git--run-command-string nil "symbolic-ref" "HEAD"))) - (vc-file-setprop file 'vc-git-detached (null str)) - (if str - (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) - (match-string 2 str) - str) - (vc-git--rev-parse "HEAD")))) + (let (process-file-side-effects) + (vc-git--rev-parse "HEAD"))) + +(defun vc-git--symbolic-ref (file) + (or + (vc-file-getprop file 'vc-git-symbolic-ref) + (let* (process-file-side-effects + (str (vc-git--run-command-string nil "symbolic-ref" "HEAD"))) + (vc-file-setprop file 'vc-git-symbolic-ref + (if str + (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) + (match-string 2 str) + str)))))) (defun vc-git-mode-line-string (file) "Return a string for `vc-mode-line' to put in the mode line for FILE." (let* ((rev (vc-working-revision file)) - (detached (vc-file-getprop file 'vc-git-detached)) + (disp-rev (or (vc-git--symbolic-ref file) + (substring rev 0 7))) (def-ml (vc-default-mode-line-string 'Git file)) (help-echo (get-text-property 0 'help-echo def-ml))) - (propertize (if detached - (substring def-ml 0 (- 7 (length rev))) - def-ml) + (propertize (replace-regexp-in-string (concat rev "\\'") disp-rev def-ml t t) 'help-echo (concat help-echo "\nCurrent revision: " rev)))) (cl-defstruct (vc-git-extra-fileinfo commit 3e0e2339cd379eeba8d9bc758f2e8e574144e252 Merge: 524eeb2 ff0a92f Author: K. Handa Date: Tue Sep 1 20:46:15 2015 +0900 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs commit 524eeb2e5e158d98ea52fe5ebe4768c4433ba8b2 Author: K. Handa Date: Tue Sep 1 20:44:51 2015 +0900 Use the new type MFLTGlyphFT for MFLTGlyphString.glyphs. * ftfont.c (MFLTGlyphFT): New type. (ftfont_get_glyph_id, ftfont_get_metrics, ftfont_drive_otf) (ftfont_shape_by_flt): Make MFLTGlyphFT the actual type of elements in the array MFLTGlyphString.glyphs. diff --git a/src/ftfont.c b/src/ftfont.c index 41d99df..885fee6 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -1574,21 +1574,33 @@ struct MFLTFontFT FT_Matrix *matrix; }; +/* The actual type of elements in the array MFLTGlyphString.glyphs. + We use this structure instead of MFLTGlyph to utilize the new + feature of libotf ver.0.9.15 which requires saving and restoring + the value of OTF_GlyphString.positioning_type in the succeeding + calls of the callback function MFLTFont.drive_otf (which is set to + ftfont_drive_otf). */ + +typedef struct { + MFLTGlyph g; + unsigned int libotf_positioning_type; +} MFLTGlyphFT; + static int ftfont_get_glyph_id (MFLTFont *font, MFLTGlyphString *gstring, int from, int to) { struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font; FT_Face ft_face = flt_font_ft->ft_face; - MFLTGlyph *g; + MFLTGlyphFT *g; - for (g = gstring->glyphs + from; from < to; g++, from++) - if (! g->encoded) + for (g = (MFLTGlyphFT *) (gstring->glyphs) + from; from < to; g++, from++) + if (! g->g.encoded) { - FT_UInt code = FT_Get_Char_Index (ft_face, g->code); + FT_UInt code = FT_Get_Char_Index (ft_face, g->g.code); - g->code = code > 0 ? code : FONT_INVALID_CODE; - g->encoded = 1; + g->g.code = code > 0 ? code : FONT_INVALID_CODE; + g->g.encoded = 1; } return 0; } @@ -1605,16 +1617,16 @@ ftfont_get_metrics (MFLTFont *font, MFLTGlyphString *gstring, { struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font; FT_Face ft_face = flt_font_ft->ft_face; - MFLTGlyph *g; + MFLTGlyphFT *g; - for (g = gstring->glyphs + from; from < to; g++, from++) - if (! g->measured) + for (g = (MFLTGlyphFT *) (gstring->glyphs) + from; from < to; g++, from++) + if (! g->g.measured) { - if (g->code != FONT_INVALID_CODE) + if (g->g.code != FONT_INVALID_CODE) { FT_Glyph_Metrics *m; - if (FT_Load_Glyph (ft_face, g->code, FT_LOAD_DEFAULT) != 0) + if (FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_DEFAULT) != 0) emacs_abort (); m = &ft_face->glyph->metrics; if (flt_font_ft->matrix) @@ -1628,29 +1640,29 @@ ftfont_get_metrics (MFLTFont *font, MFLTGlyphString *gstring, v[1].y = v[3].y = m->horiBearingY - m->height; for (i = 0; i < 4; i++) FT_Vector_Transform (v + i, flt_font_ft->matrix); - g->lbearing = v[0].x < v[1].x ? FLOOR (v[0].x) : FLOOR (v[1].x); - g->rbearing = v[2].x > v[3].x ? CEIL (v[2].x) : CEIL (v[3].x); - g->ascent = v[0].y > v[2].y ? CEIL (v[0].y) : CEIL (v[2].y); - g->descent = v[1].y < v[3].y ? - FLOOR (v[1].y) : - FLOOR (v[3].y); + g->g.lbearing = v[0].x < v[1].x ? FLOOR (v[0].x) : FLOOR (v[1].x); + g->g.rbearing = v[2].x > v[3].x ? CEIL (v[2].x) : CEIL (v[3].x); + g->g.ascent = v[0].y > v[2].y ? CEIL (v[0].y) : CEIL (v[2].y); + g->g.descent = v[1].y < v[3].y ? - FLOOR (v[1].y) : - FLOOR (v[3].y); } else { - g->lbearing = FLOOR (m->horiBearingX); - g->rbearing = CEIL (m->horiBearingX + m->width); - g->ascent = CEIL (m->horiBearingY); - g->descent = - FLOOR (m->horiBearingY - m->height); + g->g.lbearing = FLOOR (m->horiBearingX); + g->g.rbearing = CEIL (m->horiBearingX + m->width); + g->g.ascent = CEIL (m->horiBearingY); + g->g.descent = - FLOOR (m->horiBearingY - m->height); } - g->xadv = ROUND (ft_face->glyph->advance.x); + g->g.xadv = ROUND (ft_face->glyph->advance.x); } else { - g->lbearing = 0; - g->rbearing = g->xadv = flt_font_ft->font->space_width << 6; - g->ascent = flt_font_ft->font->ascent << 6; - g->descent = flt_font_ft->font->descent << 6; + g->g.lbearing = 0; + g->g.rbearing = g->g.xadv = flt_font_ft->font->space_width << 6; + g->g.ascent = flt_font_ft->font->ascent << 6; + g->g.descent = flt_font_ft->font->descent << 6; } - g->yadv = 0; - g->measured = 1; + g->g.yadv = 0; + g->g.measured = 1; } return 0; } @@ -1801,6 +1813,8 @@ ftfont_drive_otf (MFLTFont *font, MFLTGlyphAdjustment *adjustment) { struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font; + MFLTGlyphFT *in_glyphs = (MFLTGlyphFT *) (in->glyphs) + from; + MFLTGlyphFT *out_glyphs = out ? (MFLTGlyphFT *) (out->glyphs) : NULL; FT_Face ft_face = flt_font_ft->ft_face; OTF *otf = flt_font_ft->otf; int len = to - from; @@ -1852,8 +1866,11 @@ ftfont_drive_otf (MFLTFont *font, setup_otf_gstring (len); for (i = 0; i < len; i++) { - otf_gstring.glyphs[i].c = in->glyphs[from + i].c & 0x11FFFF; - otf_gstring.glyphs[i].glyph_id = in->glyphs[from + i].code; + otf_gstring.glyphs[i].c = in_glyphs[i].g.c & 0x11FFFF; + otf_gstring.glyphs[i].glyph_id = in_glyphs[i].g.code; +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + otf_gstring.glyphs[i].positioning_type = in_glyphs[i].libotf_positioning_type; +#endif } OTF_drive_gdef (otf, &otf_gstring); @@ -1861,9 +1878,15 @@ ftfont_drive_otf (MFLTFont *font, if (gsub_features && out) { +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + if (OTF_drive_gsub_features (otf, &otf_gstring, script, langsys, + gsub_features) < 0) + goto simple_copy; +#else if (OTF_drive_gsub_with_log (otf, &otf_gstring, script, langsys, gsub_features) < 0) goto simple_copy; +#endif if (out->allocated < out->used + otf_gstring.used) { SAFE_FREE (); @@ -1872,59 +1895,67 @@ ftfont_drive_otf (MFLTFont *font, features = otf->gsub->FeatureList.Feature; for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; ) { - MFLTGlyph *g; + MFLTGlyphFT *g; int min_from, max_to; - int feature_idx = otfg->positioning_type >> 4; + int feature_idx; - g = out->glyphs + out->used; - *g = in->glyphs[from + otfg->f.index.from]; - if (g->code != otfg->glyph_id) +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + feature_idx = OTF_POSITIONING_TYPE_GET_FEATURE (otfg); +#else + feature_idx = otfg->positioning_type >> 4; +#endif + g = out_glyphs + out->used; + *g = in_glyphs[otfg->f.index.from]; + if (g->g.code != otfg->glyph_id) { - g->c = 0; - g->code = otfg->glyph_id; - g->measured = 0; + g->g.c = 0; + g->g.code = otfg->glyph_id; + g->g.measured = 0; } out->used++; - min_from = g->from; - max_to = g->to; + min_from = g->g.from; + max_to = g->g.to; if (otfg->f.index.from < otfg->f.index.to) { /* OTFG substitutes multiple glyphs in IN. */ - for (j = from + otfg->f.index.from + 1; - j <= from + otfg->f.index.to; j++) + for (j = otfg->f.index.from + 1; j <= otfg->f.index.to; j++) { - if (min_from > in->glyphs[j].from) - min_from = in->glyphs[j].from; - if (max_to < in->glyphs[j].to) - max_to = in->glyphs[j].to; + if (min_from > in_glyphs[j].g.from) + min_from = in_glyphs[j].g.from; + if (max_to < in_glyphs[j].g.to) + max_to = in_glyphs[j].g.to; } - g->from = min_from; - g->to = max_to; + g->g.from = min_from; + g->g.to = max_to; } if (feature_idx) { unsigned int tag = features[feature_idx - 1].FeatureTag; tag = PACK_OTF_TAG (tag); - g->internal = (g->internal & ~0x1FFFFFFF) | tag; + g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; } for (i++, otfg++; (i < otf_gstring.used && otfg->f.index.from == otfg[-1].f.index.from); i++, otfg++) { - g = out->glyphs + out->used; - *g = in->glyphs[from + otfg->f.index.to]; - if (g->code != otfg->glyph_id) + g = out_glyphs + out->used; + *g = in_glyphs[otfg->f.index.to]; + if (g->g.code != otfg->glyph_id) { - g->c = 0; - g->code = otfg->glyph_id; - g->measured = 0; + g->g.c = 0; + g->g.code = otfg->glyph_id; + g->g.measured = 0; } +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + feature_idx = OTF_POSITIONING_TYPE_GET_FEATURE (otfg); +#else feature_idx = otfg->positioning_type >> 4; +#endif if (feature_idx) { unsigned int tag = features[feature_idx - 1].FeatureTag; tag = PACK_OTF_TAG (tag); - g->internal = (g->internal & ~0x1FFFFFFF) | tag; + g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; } out->used++; } @@ -1933,23 +1964,33 @@ ftfont_drive_otf (MFLTFont *font, else if (gsub_features) { /* Just for checking which features will be applied. */ +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + if (OTF_drive_gsub_features (otf, &otf_gstring, script, langsys, + gsub_features) < 0) + goto simple_copy; +#else if (OTF_drive_gsub_with_log (otf, &otf_gstring, script, langsys, gsub_features) < 0) goto simple_copy; +#endif features = otf->gsub->FeatureList.Feature; for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; i++, otfg++) { - int feature_idx = otfg->positioning_type >> 4; - + int feature_idx; +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + feature_idx = OTF_POSITIONING_TYPE_GET_FEATURE (otfg); +#else + feature_idx = otfg->positioning_type >> 4; +#endif if (feature_idx) { unsigned int tag = features[feature_idx - 1].FeatureTag; tag = PACK_OTF_TAG (tag); for (j = otfg->f.index.from; j <= otfg->f.index.to; j++) { - MFLTGlyph *g = in->glyphs + (from + j); - g->internal = (g->internal & ~0x1FFFFFFF) | tag; + MFLTGlyphFT *g = in_glyphs + j; + g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; } } } @@ -1962,42 +2003,61 @@ ftfont_drive_otf (MFLTFont *font, return -2; } for (i = 0; i < len; i++) - out->glyphs[out->used++] = in->glyphs[from + i]; + out_glyphs[out->used++] = in_glyphs[i]; } if (gpos_features && out) { - MFLTGlyph *base = NULL, *mark = NULL, *g; + MFLTGlyphFT *base = NULL, *mark = NULL, *g; int x_ppem, y_ppem, x_scale, y_scale; +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + if (OTF_drive_gpos_features (otf, &otf_gstring, script, langsys, + gpos_features) < 0) + { + SAFE_FREE (); + return to; + } +#else if (OTF_drive_gpos_with_log (otf, &otf_gstring, script, langsys, gpos_features) < 0) { SAFE_FREE (); return to; } +#endif features = otf->gpos->FeatureList.Feature; x_ppem = ft_face->size->metrics.x_ppem; y_ppem = ft_face->size->metrics.y_ppem; x_scale = ft_face->size->metrics.x_scale; y_scale = ft_face->size->metrics.y_scale; - for (i = 0, otfg = otf_gstring.glyphs, g = out->glyphs + gidx; - i < otf_gstring.used; i++, otfg++, g++) + for (i = 0, otfg = otf_gstring.glyphs, g = out_glyphs + gidx; + i < otf_gstring.used; i++, otfg++) { - MFLTGlyph *prev; - int feature_idx = otfg->positioning_type >> 4; + MFLTGlyphAdjustment *adjust = adjustment; + MFLTGlyphFT *prev; + int positioning_type, feature_idx; +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + positioning_type = OTF_POSITIONING_TYPE_GET_FORMAT (otfg); + feature_idx = OTF_POSITIONING_TYPE_GET_FEATURE (otfg); +#else + positioning_type = otfg->positioning_type & 0xF; + feature_idx = otfg->positioning_type >> 4; +#endif if (feature_idx) { unsigned int tag = features[feature_idx - 1].FeatureTag; tag = PACK_OTF_TAG (tag); - g->internal = (g->internal & ~0x1FFFFFFF) | tag; + g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; } if (! otfg->glyph_id) - continue; - switch (otfg->positioning_type & 0xF) + /* This is a pseudo glyph that contains positioning + information to be accumulated to a real glyph. */ + adjust--; + switch (positioning_type) { case 0: break; @@ -2007,30 +2067,30 @@ ftfont_drive_otf (MFLTFont *font, int format = otfg->f.f1.format; if (format & OTF_XPlacement) - adjustment[i].xoff + adjust->xoff = otfg->f.f1.value->XPlacement * x_scale / 0x10000; if (format & OTF_XPlaDevice) - adjustment[i].xoff + adjust->xoff += DEVICE_DELTA (otfg->f.f1.value->XPlaDevice, x_ppem); if (format & OTF_YPlacement) - adjustment[i].yoff + adjust->yoff = - (otfg->f.f1.value->YPlacement * y_scale / 0x10000); if (format & OTF_YPlaDevice) - adjustment[i].yoff + adjust->yoff -= DEVICE_DELTA (otfg->f.f1.value->YPlaDevice, y_ppem); if (format & OTF_XAdvance) - adjustment[i].xadv + adjust->xadv += otfg->f.f1.value->XAdvance * x_scale / 0x10000; if (format & OTF_XAdvDevice) - adjustment[i].xadv + adjust->xadv += DEVICE_DELTA (otfg->f.f1.value->XAdvDevice, x_ppem); if (format & OTF_YAdvance) - adjustment[i].yadv + adjust->yadv += otfg->f.f1.value->YAdvance * y_scale / 0x10000; if (format & OTF_YAdvDevice) - adjustment[i].yadv + adjust->yadv += DEVICE_DELTA (otfg->f.f1.value->YAdvDevice, y_ppem); - adjustment[i].set = 1; + adjust->set = 1; } break; case 3: /* Cursive */ @@ -2046,6 +2106,18 @@ ftfont_drive_otf (MFLTFont *font, if (! mark) break; prev = mark; +#ifdef OTF_POSITIONING_TYPE_GET_FORMAT + { + int distance = OTF_POSITIONING_TYPE_GET_MARKDISTANCE (otfg); + + if (distance > 0) + { + prev = g - distance; + if (prev < out_glyphs) + prev = mark; + } + } +#endif label_adjust_anchor: { @@ -2058,39 +2130,43 @@ ftfont_drive_otf (MFLTFont *font, mark_y = otfg->f.f4.mark_anchor->YCoordinate * y_scale / 0x10000; if (otfg->f.f4.base_anchor->AnchorFormat != 1) - adjust_anchor (ft_face, otfg->f.f4.base_anchor, - prev->code, x_ppem, y_ppem, &base_x, &base_y); + adjust_anchor (ft_face, otfg->f.f4.base_anchor, prev->g.code, + x_ppem, y_ppem, &base_x, &base_y); if (otfg->f.f4.mark_anchor->AnchorFormat != 1) - adjust_anchor (ft_face, otfg->f.f4.mark_anchor, g->code, + adjust_anchor (ft_face, otfg->f.f4.mark_anchor, g->g.code, x_ppem, y_ppem, &mark_x, &mark_y); - adjustment[i].xoff = (base_x - mark_x); - adjustment[i].yoff = - (base_y - mark_y); - adjustment[i].back = (g - prev); - adjustment[i].xadv = 0; - adjustment[i].advance_is_absolute = 1; - adjustment[i].set = 1; - this_from = g->from; - this_to = g->to; + adjust->xoff = (base_x - mark_x); + adjust->yoff = - (base_y - mark_y); + adjust->back = (g - prev); + adjust->xadv = 0; + adjust->advance_is_absolute = 1; + adjust->set = 1; + this_from = g->g.from; + this_to = g->g.to; for (j = 0; prev + j < g; j++) { - if (this_from > prev[j].from) - this_from = prev[j].from; - if (this_to < prev[j].to) - this_to = prev[j].to; + if (this_from > prev[j].g.from) + this_from = prev[j].g.from; + if (this_to < prev[j].g.to) + this_to = prev[j].g.to; } for (; prev <= g; prev++) { - prev->from = this_from; - prev->to = this_to; + prev->g.from = this_from; + prev->g.to = this_to; } } } - if (otfg->GlyphClass == OTF_GlyphClass0) - base = mark = g; - else if (otfg->GlyphClass == OTF_GlyphClassMark) - mark = g; - else - base = g; + if (otfg->glyph_id) + { + if (otfg->GlyphClass == OTF_GlyphClass0) + base = mark = g; + else if (otfg->GlyphClass == OTF_GlyphClassMark) + mark = g; + else + base = g; + g++, adjustment++; + } } } else if (gpos_features) @@ -2114,8 +2190,8 @@ ftfont_drive_otf (MFLTFont *font, tag = PACK_OTF_TAG (tag); for (j = otfg->f.index.from; j <= otfg->f.index.to; j++) { - MFLTGlyph *g = in->glyphs + (from + j); - g->internal = (g->internal & ~0x1FFFFFFF) | tag; + MFLTGlyphFT *g = in_glyphs + j; + g->g.internal = (g->g.internal & ~0x1FFFFFFF) | tag; } } } @@ -2130,8 +2206,7 @@ ftfont_drive_otf (MFLTFont *font, if (out->allocated < out->used + len) return -2; font->get_metrics (font, in, from, to); - memcpy (out->glyphs + out->used, in->glyphs + from, - sizeof (MFLTGlyph) * len); + memcpy (out->glyphs + out->used, in_glyphs, sizeof (MFLTGlyphFT) * len); out->used += len; return to; } @@ -2220,7 +2295,7 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in, } for (i = 0, otfg = otf_gstring.glyphs; i < otf_gstring.used; ) { - MFLTGlyph *g; + MFLTGlyphFT *g; int min_from, max_to; int j; @@ -2278,7 +2353,7 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in, if (gpos_features) { - MFLTGlyph *base = NULL, *mark = NULL, *g; + MFLTGlyphFT *base = NULL, *mark = NULL, *g; int x_ppem, y_ppem, x_scale, y_scale; if (OTF_drive_gpos (otf, &otf_gstring, script, langsys, gpos_features) @@ -2296,7 +2371,7 @@ ftfont_drive_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in, for (i = 0, otfg = otf_gstring.glyphs, g = out->glyphs + gidx; i < otf_gstring.used; i++, otfg++, g++) { - MFLTGlyph *prev; + MFLTGlyphFT *prev; if (! otfg->glyph_id) continue; @@ -2425,6 +2500,7 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, struct MFLTFontFT flt_font_ft; MFLT *flt = NULL; bool with_variation_selector = 0; + MFLTGlyphFT *glyphs; if (! m17n_flt_initialized) { @@ -2484,26 +2560,27 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, if (gstring.allocated == 0) { - gstring.glyph_size = sizeof (MFLTGlyph); - gstring.glyphs = xnmalloc (len * 2, sizeof *gstring.glyphs); + gstring.glyph_size = sizeof (MFLTGlyphFT); + gstring.glyphs = xnmalloc (len * 2, sizeof (MFLTGlyphFT)); gstring.allocated = len * 2; } else if (gstring.allocated < len * 2) { gstring.glyphs = xnrealloc (gstring.glyphs, len * 2, - sizeof *gstring.glyphs); + sizeof (MFLTGlyphFT)); gstring.allocated = len * 2; } - memset (gstring.glyphs, 0, len * sizeof *gstring.glyphs); + glyphs = (MFLTGlyphFT *) (gstring.glyphs); + memset (glyphs, 0, len * sizeof (MFLTGlyphFT)); for (i = 0; i < len; i++) { Lisp_Object g = LGSTRING_GLYPH (lgstring, i); - gstring.glyphs[i].c = LGLYPH_CHAR (g); + glyphs[i].g.c = LGLYPH_CHAR (g); if (with_variation_selector) { - gstring.glyphs[i].code = LGLYPH_CODE (g); - gstring.glyphs[i].encoded = 1; + glyphs[i].g.code = LGLYPH_CODE (g); + glyphs[i].g.encoded = 1; } } @@ -2544,45 +2621,45 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, if (INT_MAX / 2 < gstring.allocated) memory_full (SIZE_MAX); gstring.glyphs = xnrealloc (gstring.glyphs, - gstring.allocated, 2 * sizeof (MFLTGlyph)); + gstring.allocated, 2 * sizeof (MFLTGlyphFT)); gstring.allocated *= 2; } if (gstring.used > LGSTRING_GLYPH_LEN (lgstring)) return Qnil; for (i = 0; i < gstring.used; i++) { - MFLTGlyph *g = gstring.glyphs + i; + MFLTGlyphFT *g = (MFLTGlyphFT *) (gstring.glyphs) + i; - g->from = LGLYPH_FROM (LGSTRING_GLYPH (lgstring, g->from)); - g->to = LGLYPH_TO (LGSTRING_GLYPH (lgstring, g->to)); + g->g.from = LGLYPH_FROM (LGSTRING_GLYPH (lgstring, g->g.from)); + g->g.to = LGLYPH_TO (LGSTRING_GLYPH (lgstring, g->g.to)); } for (i = 0; i < gstring.used; i++) { Lisp_Object lglyph = LGSTRING_GLYPH (lgstring, i); - MFLTGlyph *g = gstring.glyphs + i; + MFLTGlyphFT *g = (MFLTGlyphFT *) (gstring.glyphs) + i; if (NILP (lglyph)) { lglyph = LGLYPH_NEW (); LGSTRING_SET_GLYPH (lgstring, i, lglyph); } - LGLYPH_SET_FROM (lglyph, g->from); - LGLYPH_SET_TO (lglyph, g->to); - LGLYPH_SET_CHAR (lglyph, g->c); - LGLYPH_SET_CODE (lglyph, g->code); - LGLYPH_SET_WIDTH (lglyph, g->xadv >> 6); - LGLYPH_SET_LBEARING (lglyph, g->lbearing >> 6); - LGLYPH_SET_RBEARING (lglyph, g->rbearing >> 6); - LGLYPH_SET_ASCENT (lglyph, g->ascent >> 6); - LGLYPH_SET_DESCENT (lglyph, g->descent >> 6); - if (g->adjusted) + LGLYPH_SET_FROM (lglyph, g->g.from); + LGLYPH_SET_TO (lglyph, g->g.to); + LGLYPH_SET_CHAR (lglyph, g->g.c); + LGLYPH_SET_CODE (lglyph, g->g.code); + LGLYPH_SET_WIDTH (lglyph, g->g.xadv >> 6); + LGLYPH_SET_LBEARING (lglyph, g->g.lbearing >> 6); + LGLYPH_SET_RBEARING (lglyph, g->g.rbearing >> 6); + LGLYPH_SET_ASCENT (lglyph, g->g.ascent >> 6); + LGLYPH_SET_DESCENT (lglyph, g->g.descent >> 6); + if (g->g.adjusted) { Lisp_Object vec = make_uninit_vector (3); - ASET (vec, 0, make_number (g->xoff >> 6)); - ASET (vec, 1, make_number (g->yoff >> 6)); - ASET (vec, 2, make_number (g->xadv >> 6)); + ASET (vec, 0, make_number (g->g.xoff >> 6)); + ASET (vec, 1, make_number (g->g.yoff >> 6)); + ASET (vec, 2, make_number (g->g.xadv >> 6)); LGLYPH_SET_ADJUSTMENT (lglyph, vec); } } commit ff0a92f6461941902eb9e974bdd2ff9adacb7bc4 Author: Glenn Morris Date: Tue Sep 1 06:18:29 2015 -0400 ; Auto-commit of loaddefs files. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index c571ca9..14c634f 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -65,8 +65,8 @@ should return a grid vector array that is the new solution. ;;;*** -;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21814 9129 -;;;;;; 380496 997000)) +;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21980 16567 +;;;;;; 981544 893000)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -96,8 +96,8 @@ Insert a descriptive header at the top of the file. ;;;*** -;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21855 577 -;;;;;; 357945 168000)) +;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21980 16567 +;;;;;; 981544 893000)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -108,8 +108,8 @@ Completion is available. ;;;*** -;;;### (autoloads nil "add-log" "vc/add-log.el" (21942 1330 829986 -;;;;;; 820000)) +;;;### (autoloads nil "add-log" "vc/add-log.el" (21985 34484 266705 +;;;;;; 925000)) ;;; Generated autoloads from vc/add-log.el (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) @@ -238,8 +238,8 @@ old-style time formats for entries are supported. ;;;*** -;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21895 57521 -;;;;;; 590301 332000)) +;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21976 19509 +;;;;;; 764430 241000)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -374,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...) ;;;*** -;;;### (autoloads nil "align" "align.el" (21948 40114 174686 453000)) +;;;### (autoloads nil "align" "align.el" (21980 16567 345544 893000)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -477,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** -;;;### (autoloads nil "allout" "allout.el" (21907 48688 645360 195000)) +;;;### (autoloads nil "allout" "allout.el" (21981 37426 507399 97000)) ;;; Generated autoloads from allout.el (push (purecopy '(allout 2 3)) package--builtin-versions) @@ -670,7 +670,7 @@ M-x outlineify-sticky Activate outline mode for current buffer, buffer with name derived from derived from that of current buffer -- \"*BUFFERNAME exposed*\". \\[allout-flatten-exposed-to-buffer] `allout-flatten-exposed-to-buffer' - Like above 'copy-exposed', but convert topic + Like above `copy-exposed', but convert topic prefixes to section.subsection... numeric format. \\[customize-variable] allout-auto-activation @@ -694,7 +694,7 @@ symmetric decryption keys, preventing entry of the correct key on subsequent decryption attempts until the cache times-out. That can take several minutes. (Decryption of other entries is not affected.) Upgrade your EasyPG version, if you can, and you can -deliberately clear your gpg-agent's cache by sending it a '-HUP' +deliberately clear your gpg-agent's cache by sending it a `-HUP' signal. See `allout-toggle-current-subtree-encryption' function docstring @@ -837,8 +837,8 @@ for details on preparing Emacs for automatic allout activation. ;;;*** -;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21855 -;;;;;; 576 417950 874000)) +;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21980 +;;;;;; 16567 353544 893000)) ;;; Generated autoloads from allout-widgets.el (push (purecopy '(allout-widgets 1 0)) package--builtin-versions) @@ -896,8 +896,8 @@ outline hot-spot navigation (see `allout-mode'). ;;;*** -;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21948 40114 314686 -;;;;;; 453000)) +;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21980 16567 805544 +;;;;;; 893000)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -951,8 +951,8 @@ the buffer *Birthday-Present-for-Name*. ;;;*** -;;;### (autoloads nil "ansi-color" "ansi-color.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21952 37178 110214 +;;;;;; 961000)) ;;; Generated autoloads from ansi-color.el (push (purecopy '(ansi-color 3 4 2)) package--builtin-versions) @@ -978,8 +978,8 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** -;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21670 -;;;;;; 32331 385639 720000)) +;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21980 +;;;;;; 16567 993544 893000)) ;;; Generated autoloads from progmodes/antlr-mode.el (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions) @@ -1015,8 +1015,8 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;*** -;;;### (autoloads nil "appt" "calendar/appt.el" (21880 42526 275119 -;;;;;; 615000)) +;;;### (autoloads nil "appt" "calendar/appt.el" (21976 19509 728430 +;;;;;; 241000)) ;;; Generated autoloads from calendar/appt.el (autoload 'appt-add "appt" "\ @@ -1037,7 +1037,8 @@ ARG is positive, otherwise off. ;;;*** -;;;### (autoloads nil "apropos" "apropos.el" (21905 6960 85493 11000)) +;;;### (autoloads nil "apropos" "apropos.el" (21985 34484 142705 +;;;;;; 925000)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1479,8 +1480,8 @@ Special commands: ;;;*** -;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21670 -;;;;;; 32330 885624 725000)) +;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21981 +;;;;;; 37426 543399 97000)) ;;; Generated autoloads from gnus/auth-source.el (defvar auth-source-cache-expiry 7200 "\ @@ -1564,8 +1565,8 @@ Major mode for editing Autoconf configure.ac files. ;;;*** -;;;### (autoloads nil "autoinsert" "autoinsert.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "autoinsert" "autoinsert.el" (21980 16567 365544 +;;;;;; 893000)) ;;; Generated autoloads from autoinsert.el (autoload 'auto-insert "autoinsert" "\ @@ -1655,8 +1656,8 @@ should be non-nil). ;;;*** -;;;### (autoloads nil "autorevert" "autorevert.el" (21928 54832 51662 -;;;;;; 924000)) +;;;### (autoloads nil "autorevert" "autorevert.el" (21980 16567 365544 +;;;;;; 893000)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1744,7 +1745,7 @@ specifies in the mode line. ;;;*** -;;;### (autoloads nil "avoid" "avoid.el" (21670 32330 885624 725000)) +;;;### (autoloads nil "avoid" "avoid.el" (21955 13362 292569 401000)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1874,8 +1875,8 @@ For non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21948 40114 -;;;;;; 506686 453000)) +;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21988 10682 +;;;;;; 61624 461000)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -2122,8 +2123,8 @@ a reflection. ;;;*** -;;;### (autoloads nil "bookmark" "bookmark.el" (21798 49947 232670 -;;;;;; 676000)) +;;;### (autoloads nil "bookmark" "bookmark.el" (21980 16567 369544 +;;;;;; 893000)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2657,7 +2658,7 @@ from `browse-url-elinks-wrapper'. ;;;*** -;;;### (autoloads nil "bs" "bs.el" (21670 32330 885624 725000)) +;;;### (autoloads nil "bs" "bs.el" (21980 16567 373544 893000)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) @@ -2698,8 +2699,8 @@ name of buffer configuration. ;;;*** -;;;### (autoloads nil "bubbles" "play/bubbles.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "bubbles" "play/bubbles.el" (21980 16567 957544 +;;;;;; 893000)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2721,7 +2722,7 @@ columns on its right towards the left. ;;;*** ;;;### (autoloads nil "bug-reference" "progmodes/bug-reference.el" -;;;;;; (21670 32331 385639 720000)) +;;;;;; (21980 16567 993544 893000)) ;;; Generated autoloads from progmodes/bug-reference.el (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format))))) @@ -2741,8 +2742,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings. ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21888 -;;;;;; 49772 464181 796000)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21988 +;;;;;; 10681 977624 461000)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2897,7 +2898,7 @@ from the cursor position. ;;;*** -;;;### (autoloads nil "calc" "calc/calc.el" (21855 576 517945 858000)) +;;;### (autoloads nil "calc" "calc/calc.el" (21985 34484 202705 925000)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -2994,8 +2995,8 @@ See Info node `(calc)Defining Functions'. ;;;*** -;;;### (autoloads nil "calculator" "calculator.el" (21850 35126 597287 -;;;;;; 693000)) +;;;### (autoloads nil "calculator" "calculator.el" (21974 64192 548009 +;;;;;; 993000)) ;;; Generated autoloads from calculator.el (autoload 'calculator "calculator" "\ @@ -3006,8 +3007,8 @@ See the documentation for `calculator-mode' for more information. ;;;*** -;;;### (autoloads nil "calendar" "calendar/calendar.el" (21887 28943 -;;;;;; 471667 16000)) +;;;### (autoloads nil "calendar" "calendar/calendar.el" (21980 16567 +;;;;;; 413544 893000)) ;;; Generated autoloads from calendar/calendar.el (autoload 'calendar "calendar" "\ @@ -3068,8 +3069,8 @@ it fails. ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21855 -;;;;;; 577 387944 393000)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21988 +;;;;;; 10682 33624 461000)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3079,8 +3080,8 @@ Return the syntactic context of the current line. ;;;*** -;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21855 577 -;;;;;; 397944 786000)) +;;;### (autoloads nil "cc-guess" "progmodes/cc-guess.el" (21976 19510 +;;;;;; 84430 241000)) ;;; Generated autoloads from progmodes/cc-guess.el (defvar c-guess-guessed-offsets-alist nil "\ @@ -3178,8 +3179,8 @@ the absolute file name of the file if STYLE-NAME is nil. ;;;*** -;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21861 39358 -;;;;;; 537945 535000)) +;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21976 19510 +;;;;;; 104430 241000)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3336,8 +3337,8 @@ Key bindings: ;;;*** -;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21670 -;;;;;; 32331 385639 720000)) +;;;### (autoloads nil "cc-styles" "progmodes/cc-styles.el" (21976 +;;;;;; 19510 104430 241000)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload 'c-set-style "cc-styles" "\ @@ -3388,8 +3389,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21976 19510 +;;;;;; 104430 241000)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3397,8 +3398,8 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "ccl" "international/ccl.el" (21682 23484 726747 -;;;;;; 991000)) +;;;### (autoloads nil "ccl" "international/ccl.el" (21988 10681 977624 +;;;;;; 461000)) ;;; Generated autoloads from international/ccl.el (autoload 'ccl-compile "ccl" "\ @@ -3691,8 +3692,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21716 41663 -;;;;;; 456033 27000)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21978 61237 +;;;;;; 422488 269000)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3718,8 +3719,8 @@ Add the warnings that closure conversion would encounter. ;;;*** -;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21931 31023 -;;;;;; 757164 572000)) +;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21980 16568 +;;;;;; 17544 893000)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 4)) package--builtin-versions) @@ -3748,11 +3749,11 @@ Choose `cfengine2-mode' or `cfengine3-mode' by buffer contents. ;;;*** -;;;### (autoloads nil "character-fold" "character-fold.el" (21914 -;;;;;; 21937 447876 215000)) +;;;### (autoloads nil "character-fold" "character-fold.el" (21973 +;;;;;; 43315 242113 285000)) ;;; Generated autoloads from character-fold.el -(defvar character-fold-search t "\ +(defvar character-fold-search nil "\ Non-nil if searches should fold similar characters. This means some characters will match entire groups of characters. For instance, \" will match all variants of double quotes, and @@ -3772,15 +3773,15 @@ match any number of times. ;;;*** -;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21841 54062 -;;;;;; 162628 940000)) +;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21976 19509 +;;;;;; 812430 241000)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" -;;;;;; (21888 49792 712181 796000)) +;;;;;; (21978 61237 422488 269000)) ;;; Generated autoloads from emacs-lisp/check-declare.el (autoload 'check-declare-file "check-declare" "\ @@ -3797,8 +3798,8 @@ Returns non-nil if any false statements are found. ;;;*** -;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21948 -;;;;;; 40114 230686 453000)) +;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21986 +;;;;;; 55346 260512 613000)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (push (purecopy '(checkdoc 0 6 2)) package--builtin-versions) (put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp) @@ -4189,8 +4190,8 @@ a future Emacs interpreter will be able to use it.") ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21828 42028 -;;;;;; 650494 471000)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21988 10682 +;;;;;; 33624 461000)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4250,7 +4251,7 @@ If FRAME cannot display COLOR, return nil. ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21810 12071 401207 648000)) +;;;### (autoloads nil "comint" "comint.el" (21980 16567 473544 893000)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4388,8 +4389,8 @@ on third call it again advances points to the next difference and so on. ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21911 45744 -;;;;;; 555516 371000)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21980 16568 +;;;;;; 17544 893000)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4593,8 +4594,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21670 -;;;;;; 32331 885635 586000)) +;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21988 +;;;;;; 10682 61624 461000)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4778,8 +4779,8 @@ and subsequent calls on the same file won't go to disk. ;;;*** -;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21670 -;;;;;; 32330 885624 725000)) +;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21976 +;;;;;; 19509 832430 241000)) ;;; Generated autoloads from emacs-lisp/copyright.el (put 'copyright-at-end-flag 'safe-local-variable 'booleanp) (put 'copyright-names-regexp 'safe-local-variable 'stringp) @@ -4817,8 +4818,8 @@ If FIX is non-nil, run `copyright-fix-years' instead. ;;;*** -;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21862 -;;;;;; 60209 828658 75000)) +;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21980 +;;;;;; 16568 21544 893000)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -5016,8 +5017,8 @@ Run a `perldoc' on the word around point. ;;;*** -;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21948 40114 418686 -;;;;;; 453000)) +;;;### (autoloads nil "cpp" "progmodes/cpp.el" (21988 10682 33624 +;;;;;; 461000)) ;;; Generated autoloads from progmodes/cpp.el (autoload 'cpp-highlight-buffer "cpp" "\ @@ -5035,8 +5036,8 @@ Edit display information for cpp conditionals. ;;;*** -;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "crm" "emacs-lisp/crm.el" (21980 16567 501544 +;;;;;; 893000)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload 'completing-read-multiple "crm" "\ @@ -5062,8 +5063,8 @@ with empty strings removed. ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21811 32939 -;;;;;; 200500 777000)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21985 34484 +;;;;;; 258705 925000)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5158,8 +5159,8 @@ entering the area covered by the text-property property or leaving it. ;;;*** -;;;### (autoloads nil "cus-edit" "cus-edit.el" (21948 40114 214686 -;;;;;; 453000)) +;;;### (autoloads nil "cus-edit" "cus-edit.el" (21981 37426 511399 +;;;;;; 97000)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5478,8 +5479,8 @@ The format is suitable for use with `easy-menu-define'. ;;;*** -;;;### (autoloads nil "cus-theme" "cus-theme.el" (21891 60465 839679 -;;;;;; 523000)) +;;;### (autoloads nil "cus-theme" "cus-theme.el" (21985 34484 218705 +;;;;;; 925000)) ;;; Generated autoloads from cus-theme.el (autoload 'customize-create-theme "cus-theme" "\ @@ -5597,8 +5598,8 @@ If the argument is nil, we return the display table to its standard state. ;;;*** -;;;### (autoloads nil "dabbrev" "dabbrev.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "dabbrev" "dabbrev.el" (21980 16567 473544 +;;;;;; 893000)) ;;; Generated autoloads from dabbrev.el (put 'dabbrev-case-fold-search 'risky-local-variable t) (put 'dabbrev-case-replace 'risky-local-variable t) @@ -5644,8 +5645,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "data-debug" "cedet/data-debug.el" (21974 64192 +;;;;;; 556009 993000)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5668,8 +5669,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message. ;;;*** -;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21980 16568 +;;;;;; 21544 893000)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5868,8 +5869,8 @@ The most useful commands are: ;;;*** -;;;### (autoloads nil "delim-col" "delim-col.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "delim-col" "delim-col.el" (21980 16567 477544 +;;;;;; 893000)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) @@ -5894,7 +5895,7 @@ START and END delimits the corners of text rectangle. ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (21716 41663 456033 27000)) +;;;### (autoloads nil "delsel" "delsel.el" (21973 43315 242113 285000)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5922,8 +5923,8 @@ point regardless of any selection. ;;;*** -;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21887 19078 -;;;;;; 977447 760000)) +;;;### (autoloads nil "derived" "emacs-lisp/derived.el" (21978 61237 +;;;;;; 450488 269000)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload 'define-derived-mode "derived" "\ @@ -5991,8 +5992,8 @@ the first time the mode is used. ;;;*** -;;;### (autoloads nil "descr-text" "descr-text.el" (21948 40114 214686 -;;;;;; 453000)) +;;;### (autoloads nil "descr-text" "descr-text.el" (21981 37426 511399 +;;;;;; 97000)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -6041,7 +6042,8 @@ This function is meant to be used as a value of ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21860 18496 17962 857000)) +;;;### (autoloads nil "desktop" "desktop.el" (21976 19509 748430 +;;;;;; 241000)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6064,8 +6066,8 @@ one session to another. In particular, Emacs will save the desktop when it exits (this may prompt you; see the option `desktop-save'). The next time Emacs starts, if this mode is active it will restore the desktop. -To manually save the desktop at any time, use the command `M-x desktop-save'. -To load it, use `M-x desktop-read'. +To manually save the desktop at any time, use the command `\\[desktop-save]'. +To load it, use `\\[desktop-read]'. Once a desktop file exists, Emacs will auto-save it according to the option `desktop-auto-save-timeout'. @@ -6283,8 +6285,8 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** -;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21880 -;;;;;; 42532 420045 615000)) +;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21985 +;;;;;; 34484 206705 925000)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6374,8 +6376,8 @@ This requires the external program `diff' to be in your `exec-path'. ;;;*** -;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21798 20907 -;;;;;; 11218 42000)) +;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21985 34484 +;;;;;; 282705 925000)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6418,7 +6420,7 @@ Optional arguments are passed to `dig-invoke'. ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21914 55048 605882 55000)) +;;;### (autoloads nil "dired" "dired.el" (21985 34484 222705 925000)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6544,8 +6546,8 @@ Keybindings: ;;;*** -;;;### (autoloads nil "dirtrack" "dirtrack.el" (21855 576 727950 -;;;;;; 398000)) +;;;### (autoloads nil "dirtrack" "dirtrack.el" (21981 37426 531399 +;;;;;; 97000)) ;;; Generated autoloads from dirtrack.el (autoload 'dirtrack-mode "dirtrack" "\ @@ -6590,8 +6592,8 @@ redefine OBJECT if it is a symbol. ;;;*** -;;;### (autoloads nil "disp-table" "disp-table.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "disp-table" "disp-table.el" (21981 37426 535399 +;;;;;; 97000)) ;;; Generated autoloads from disp-table.el (autoload 'make-display-table "disp-table" "\ @@ -6831,7 +6833,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** -;;;### (autoloads nil "double" "double.el" (21670 32330 885624 725000)) +;;;### (autoloads nil "double" "double.el" (21953 58033 239058 929000)) ;;; Generated autoloads from double.el (autoload 'double-mode "double" "\ @@ -6847,10 +6849,10 @@ strings when pressed twice. See `double-map' for details. ;;;*** -;;;### (autoloads nil "dunnet" "play/dunnet.el" (21841 54062 172628 -;;;;;; 227000)) +;;;### (autoloads nil "dunnet" "play/dunnet.el" (21980 16567 965544 +;;;;;; 893000)) ;;; Generated autoloads from play/dunnet.el -(push (purecopy '(dunnet 2 1)) package--builtin-versions) +(push (purecopy '(dunnet 2 2)) package--builtin-versions) (autoload 'dunnet "dunnet" "\ Switch to *dungeon* buffer and start game. @@ -7143,8 +7145,8 @@ To implement dynamic menus, either call this from ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21978 61237 +;;;;;; 706488 269000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) @@ -7409,8 +7411,8 @@ See `ebnf-style-database' documentation. ;;;*** -;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21988 10682 +;;;;;; 37624 461000)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload 'ebrowse-tree-mode "ebrowse" "\ @@ -7558,8 +7560,8 @@ Display statistics for a class tree. ;;;*** -;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (21953 58033 239058 +;;;;;; 929000)) ;;; Generated autoloads from ebuff-menu.el (autoload 'electric-buffer-list "ebuff-menu" "\ @@ -7614,7 +7616,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;*** -;;;### (autoloads nil "ede" "cedet/ede.el" (21947 19252 621252 749000)) +;;;### (autoloads nil "ede" "cedet/ede.el" (21986 55346 252512 613000)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) @@ -7640,8 +7642,8 @@ an EDE controlled project. ;;;*** -;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21857 42300 -;;;;;; 387957 585000)) +;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21980 16567 +;;;;;; 505544 893000)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7652,7 +7654,7 @@ This applies to `eval-defun', `eval-region', `eval-buffer', and You can use the command `edebug-all-defs' to toggle the value of this variable. You may wish to make it local to each buffer with -\(make-local-variable 'edebug-all-defs) in your +\(make-local-variable \\='edebug-all-defs) in your `emacs-lisp-mode-hook'.") (custom-autoload 'edebug-all-defs "edebug" t) @@ -7705,7 +7707,7 @@ Toggle edebugging of all forms. ;;;*** -;;;### (autoloads nil "ediff" "vc/ediff.el" (21670 32331 885635 586000)) +;;;### (autoloads nil "ediff" "vc/ediff.el" (21985 34484 298705 925000)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) @@ -8001,8 +8003,8 @@ Display Ediff's registry. ;;;*** -;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21852 24382 -;;;;;; 97237 703000)) +;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21985 34484 +;;;;;; 298705 925000)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -8021,8 +8023,8 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;*** -;;;### (autoloads nil "edmacro" "edmacro.el" (21799 41766 961230 -;;;;;; 875000)) +;;;### (autoloads nil "edmacro" "edmacro.el" (21976 19509 748430 +;;;;;; 241000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) @@ -8030,7 +8032,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. Edit a keyboard macro. At the prompt, type any key sequence which is bound to a keyboard macro. Or, type `C-x e' or RET to edit the last keyboard macro, `C-h l' to edit -the last 300 keystrokes as a keyboard macro, or `M-x' to edit a macro by +the last 300 keystrokes as a keyboard macro, or `\\[execute-extended-command]' to edit a macro by its command name. With a prefix argument, format the macro in a more concise way. @@ -8071,8 +8073,8 @@ or nil, use a compact 80-column format. ;;;*** -;;;### (autoloads nil "edt" "emulation/edt.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "edt" "emulation/edt.el" (21986 55346 264512 +;;;;;; 613000)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -8089,7 +8091,7 @@ Turn on EDT Emulation. ;;;*** -;;;### (autoloads nil "ehelp" "ehelp.el" (21670 32330 885624 725000)) +;;;### (autoloads nil "ehelp" "ehelp.el" (21953 58033 247058 929000)) ;;; Generated autoloads from ehelp.el (autoload 'with-electric-help "ehelp" "\ @@ -8125,15 +8127,15 @@ BUFFER is put back into its original major mode. ;;;*** -;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21915 42801 -;;;;;; 52409 735000)) +;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21978 61583 +;;;;;; 178488 269000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21915 -;;;;;; 42801 48409 735000)) +;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21978 +;;;;;; 61237 458488 269000)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) @@ -8207,8 +8209,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** -;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21853 45243 -;;;;;; 381515 341000)) +;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21980 16567 +;;;;;; 505544 893000)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8306,8 +8308,8 @@ Other values are interpreted as usual. ;;;*** -;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21814 9129 290493 -;;;;;; 495000)) +;;;### (autoloads nil "emacsbug" "mail/emacsbug.el" (21989 31537 +;;;;;; 887825 721000)) ;;; Generated autoloads from mail/emacsbug.el (autoload 'report-emacs-bug "emacsbug" "\ @@ -8320,8 +8322,8 @@ Prompts for bug subject. Leaves you in a mail buffer. ;;;*** -;;;### (autoloads nil "emerge" "vc/emerge.el" (21607 54478 800121 -;;;;;; 42000)) +;;;### (autoloads nil "emerge" "vc/emerge.el" (21953 58033 507058 +;;;;;; 929000)) ;;; Generated autoloads from vc/emerge.el (autoload 'emerge-files "emerge" "\ @@ -8417,7 +8419,7 @@ Commands: ;;;*** -;;;### (autoloads nil "epa" "epa.el" (21948 40114 234686 453000)) +;;;### (autoloads nil "epa" "epa.el" (21980 16567 517544 893000)) ;;; Generated autoloads from epa.el (autoload 'epa-list-keys "epa" "\ @@ -8479,10 +8481,10 @@ should consider using the string based counterpart For example: -\(let ((context (epg-make-context 'OpenPGP))) +\(let ((context (epg-make-context \\='OpenPGP))) (decode-coding-string (epg-decrypt-string context (buffer-substring start end)) - 'utf-8)) + \\='utf-8)) \(fn START END &optional MAKE-BUFFER-FUNCTION)" t nil) @@ -8509,10 +8511,10 @@ should consider using the string based counterpart For example: -\(let ((context (epg-make-context 'OpenPGP))) +\(let ((context (epg-make-context \\='OpenPGP))) (decode-coding-string (epg-verify-string context (buffer-substring start end)) - 'utf-8)) + \\='utf-8)) \(fn START END)" t nil) @@ -8541,10 +8543,10 @@ based counterpart `epg-sign-file' instead. For example: -\(let ((context (epg-make-context 'OpenPGP))) +\(let ((context (epg-make-context \\='OpenPGP))) (epg-sign-string context - (encode-coding-string (buffer-substring start end) 'utf-8))) + (encode-coding-string (buffer-substring start end) \\='utf-8))) \(fn START END SIGNERS MODE)" t nil) @@ -8562,10 +8564,10 @@ file based counterpart `epg-encrypt-file' instead. For example: -\(let ((context (epg-make-context 'OpenPGP))) +\(let ((context (epg-make-context \\='OpenPGP))) (epg-encrypt-string context - (encode-coding-string (buffer-substring start end) 'utf-8) + (encode-coding-string (buffer-substring start end) \\='utf-8) nil)) \(fn START END RECIPIENTS SIGN SIGNERS)" t nil) @@ -8631,8 +8633,8 @@ Encrypt marked files. ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "epa-file" "epa-file.el" (21964 28338 113695 +;;;;;; 749000)) ;;; Generated autoloads from epa-file.el (autoload 'epa-file-handler "epa-file" "\ @@ -8730,7 +8732,7 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21931 31023 725164 572000)) +;;;### (autoloads nil "epg" "epg.el" (21980 16567 517544 893000)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) @@ -8762,7 +8764,7 @@ Look at CONFIG and try to expand GROUP. ;;;*** -;;;### (autoloads nil "erc" "erc/erc.el" (21907 48688 693360 195000)) +;;;### (autoloads nil "erc" "erc/erc.el" (21980 16567 529544 893000)) ;;; Generated autoloads from erc/erc.el (push (purecopy '(erc 5 3)) package--builtin-versions) @@ -8811,15 +8813,15 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21670 -;;;;;; 32330 885624 725000)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (21989 +;;;;;; 31537 763825 721000)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21980 16567 +;;;;;; 517544 893000)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) @@ -8839,8 +8841,8 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21948 40114 242686 -;;;;;; 453000)) +;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21980 16567 517544 +;;;;;; 893000)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8939,8 +8941,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "erc-fill" "erc/erc-fill.el" (21989 31537 771825 +;;;;;; 721000)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -9029,8 +9031,8 @@ You can save every individual message by putting this function on ;;;*** -;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21980 16567 +;;;;;; 517544 893000)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9160,8 +9162,8 @@ with args, toggle notify status of people. ;;;*** -;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21670 -;;;;;; 32330 885624 725000)) +;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21980 +;;;;;; 16567 517544 893000)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9185,8 +9187,8 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21670 -;;;;;; 32330 885624 725000)) +;;;### (autoloads nil "erc-speedbar" "erc/erc-speedbar.el" (21980 +;;;;;; 16567 521544 893000)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload 'erc-speedbar-browser "erc-speedbar" "\ @@ -9211,8 +9213,8 @@ This will add a speedbar major display mode. ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21980 16567 +;;;;;; 521544 893000)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9269,8 +9271,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21870 18240 719373 -;;;;;; 247000)) +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21976 19509 868430 +;;;;;; 241000)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9339,8 +9341,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test). ;;;*** -;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21980 16567 +;;;;;; 505544 893000)) ;;; Generated autoloads from emacs-lisp/ert-x.el (put 'ert-with-test-buffer 'lisp-indent-function 1) @@ -9399,8 +9401,8 @@ corresponding to a successful execution. ;;;*** -;;;### (autoloads nil "etags" "progmodes/etags.el" (21919 39857 637327 -;;;;;; 44000)) +;;;### (autoloads nil "etags" "progmodes/etags.el" (21988 10682 37624 +;;;;;; 461000)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -10078,8 +10080,8 @@ Display the bookmarks. ;;;*** -;;;### (autoloads nil "executable" "progmodes/executable.el" (21880 -;;;;;; 39991 389803 616000)) +;;;### (autoloads nil "executable" "progmodes/executable.el" (21988 +;;;;;; 10682 37624 461000)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -10391,8 +10393,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'. ;;;*** -;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21607 54478 -;;;;;; 300138 641000)) +;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21989 31537 +;;;;;; 891825 721000)) ;;; Generated autoloads from mail/feedmail.el (push (purecopy '(feedmail 11)) package--builtin-versions) @@ -10446,7 +10448,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (21948 40114 250686 453000)) +;;;### (autoloads nil "ffap" "ffap.el" (21960 31281 328212 153000)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10583,7 +10585,8 @@ Otherwise, signal a `file-notify-error'. ;;;*** -;;;### (autoloads nil "files-x" "files-x.el" (21880 40973 57803 616000)) +;;;### (autoloads nil "files-x" "files-x.el" (21980 16567 557544 +;;;;;; 893000)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10648,8 +10651,8 @@ Copy directory-local variables to the -*- line. ;;;*** -;;;### (autoloads nil "filesets" "filesets.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "filesets" "filesets.el" (21980 16567 557544 +;;;;;; 893000)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10660,8 +10663,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "find-cmd" "find-cmd.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "find-cmd" "find-cmd.el" (21980 16567 573544 +;;;;;; 893000)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) @@ -10669,8 +10672,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu. Initiate the building of a find command. For example: -\(find-cmd '(prune (name \".svn\" \".git\" \".CVS\")) - '(and (or (name \"*.pl\" \"*.pm\" \"*.t\") +\(find-cmd \\='(prune (name \".svn\" \".git\" \".CVS\")) + \\='(and (or (name \"*.pl\" \"*.pm\" \"*.t\") (mtime \"+1\")) (fstype \"nfs\" \"ufs\")))) @@ -10681,8 +10684,8 @@ result is a string that should be ready for the command line. ;;;*** -;;;### (autoloads nil "find-dired" "find-dired.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "find-dired" "find-dired.el" (21981 37426 535399 +;;;;;; 97000)) ;;; Generated autoloads from find-dired.el (autoload 'find-dired "find-dired" "\ @@ -10702,7 +10705,7 @@ and run Dired on those files. PATTERN is a shell wildcard (not an Emacs regexp) and need not be quoted. The default command run (after changing into DIR) is - find . -name 'PATTERN' -ls + find . -name \\='PATTERN\\=' -ls See `find-name-arg' to customize the arguments. @@ -10813,8 +10816,8 @@ Visit the file you click on in another window. ;;;*** -;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21895 -;;;;;; 57521 598301 332000)) +;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21978 +;;;;;; 61237 486488 269000)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -11005,7 +11008,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP. ;;;*** -;;;### (autoloads nil "finder" "finder.el" (21874 386 410923 336000)) +;;;### (autoloads nil "finder" "finder.el" (21980 16567 573544 893000)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) @@ -11065,8 +11068,8 @@ to get the effect of a C-q. ;;;*** -;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21907 48688 -;;;;;; 777360 195000)) +;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21980 16568 +;;;;;; 25544 893000)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) @@ -11096,8 +11099,8 @@ Turn flymake mode off. ;;;*** -;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21948 40114 -;;;;;; 506686 453000)) +;;;### (autoloads nil "flyspell" "textmodes/flyspell.el" (21980 16568 +;;;;;; 77544 893000)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -11174,7 +11177,7 @@ Flyspell whole buffer. ;;;*** -;;;### (autoloads nil "follow" "follow.el" (21670 32330 885624 725000)) +;;;### (autoloads nil "follow" "follow.el" (21976 19509 932430 241000)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11213,7 +11216,7 @@ and being able to use 144 lines instead of the normal 72... (your mileage may vary). To split one large window into two side-by-side windows, the commands -`\\[split-window-right]' or `M-x follow-delete-other-windows-and-split' can be used. +`\\[split-window-right]' or `\\[follow-delete-other-windows-and-split]' can be used. Only windows displayed in the same frame follow each other. @@ -11262,7 +11265,7 @@ play around with the following keys: ;;;*** -;;;### (autoloads nil "forms" "forms.el" (21852 24381 567240 49000)) +;;;### (autoloads nil "forms" "forms.el" (21981 37426 535399 97000)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11298,8 +11301,8 @@ Visit a file in Forms mode in other window. ;;;*** -;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21914 21937 -;;;;;; 467876 215000)) +;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21953 58033 +;;;;;; 403058 929000)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11619,8 +11622,8 @@ Interactively, reads the register using `register-read-with-preview'. ;;;*** -;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21852 24381 -;;;;;; 917233 10000)) +;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21980 16568 +;;;;;; 25544 893000)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11848,7 +11851,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** -;;;### (autoloads nil "gnus" "gnus/gnus.el" (21670 32330 885624 725000)) +;;;### (autoloads nil "gnus" "gnus/gnus.el" (21980 16567 677544 893000)) ;;; Generated autoloads from gnus/gnus.el (push (purecopy '(gnus 5 13)) package--builtin-versions) (when (fboundp 'custom-autoload) @@ -11898,8 +11901,8 @@ prompt the user for the name of an NNTP server to use. ;;;*** -;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "gnus-agent" "gnus/gnus-agent.el" (21989 31537 +;;;;;; 791825 721000)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11989,8 +11992,8 @@ CLEAN is obsolete and ignored. ;;;*** -;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21870 54319 -;;;;;; 237944 669000)) +;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21989 31537 +;;;;;; 811825 721000)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -12140,8 +12143,8 @@ Reminder user if there are unsent drafts. ;;;*** -;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "gnus-fun" "gnus/gnus-fun.el" (21989 31537 +;;;;;; 811825 721000)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload 'gnus--random-face-with-type "gnus-fun" "\ @@ -12224,8 +12227,8 @@ If gravatars are already displayed, remove them. ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21918 18992 -;;;;;; 805579 660000)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21989 31537 +;;;;;; 823825 721000)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12242,8 +12245,8 @@ Pop up a frame and enter GROUP. ;;;*** -;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "gnus-html" "gnus/gnus-html.el" (21972 22452 +;;;;;; 190264 357000)) ;;; Generated autoloads from gnus/gnus-html.el (autoload 'gnus-article-html "gnus-html" "\ @@ -12533,8 +12536,8 @@ Add NUM into sorted LIST by side effect. ;;;*** -;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21948 -;;;;;; 40114 254686 453000)) +;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21981 +;;;;;; 37426 571399 97000)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12549,8 +12552,8 @@ Install the registry hooks. ;;;*** -;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21980 16567 +;;;;;; 617544 893000)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload 'gnus-sieve-update "gnus-sieve" "\ @@ -12588,8 +12591,8 @@ Update the format specification near point. ;;;*** -;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21716 41663 -;;;;;; 456033 27000)) +;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21981 37426 +;;;;;; 575399 97000)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12599,8 +12602,8 @@ Declare back end NAME with ABILITIES as a Gnus back end. ;;;*** -;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21855 576 897951 -;;;;;; 62000)) +;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21989 31537 +;;;;;; 843825 721000)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12638,8 +12641,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads nil "gnutls" "net/gnutls.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "gnutls" "net/gnutls.el" (21978 61237 642488 +;;;;;; 269000)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits 256 "\ @@ -12655,8 +12658,8 @@ A value of nil says to use the default GnuTLS value.") ;;;*** -;;;### (autoloads nil "gomoku" "play/gomoku.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "gomoku" "play/gomoku.el" (21980 16567 969544 +;;;;;; 893000)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -13015,8 +13018,8 @@ it if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21916 4736 835897 -;;;;;; 451000)) +;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21976 19509 880430 +;;;;;; 241000)) ;;; Generated autoloads from emacs-lisp/gv.el (autoload 'gv-get "gv" "\ @@ -13335,8 +13338,8 @@ different regions. With numeric argument ARG, behaves like ;;;*** -;;;### (autoloads nil "help-fns" "help-fns.el" (21915 42801 64409 -;;;;;; 735000)) +;;;### (autoloads nil "help-fns" "help-fns.el" (21985 34484 226705 +;;;;;; 925000)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -13435,8 +13438,8 @@ gives the window that lists the options.") ;;;*** -;;;### (autoloads nil "help-mode" "help-mode.el" (21915 42801 64409 -;;;;;; 735000)) +;;;### (autoloads nil "help-mode" "help-mode.el" (21972 22452 270264 +;;;;;; 357000)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13448,12 +13451,12 @@ Commands: \(fn)" t nil) (autoload 'help-mode-setup "help-mode" "\ - +Enter Help Mode in the current buffer. \(fn)" nil nil) (autoload 'help-mode-finish "help-mode" "\ - +Finalize Help Mode setup in current buffer. \(fn)" nil nil) @@ -13553,7 +13556,7 @@ Provide help for current mode. ;;;*** -;;;### (autoloads nil "hexl" "hexl.el" (21695 35516 595262 313000)) +;;;### (autoloads nil "hexl" "hexl.el" (21985 34484 226705 925000)) ;;; Generated autoloads from hexl.el (autoload 'hexl-mode "hexl" "\ @@ -13814,8 +13817,8 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** -;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21799 41767 -;;;;;; 51222 992000)) +;;;### (autoloads nil "hideif" "progmodes/hideif.el" (21989 31537 +;;;;;; 939825 721000)) ;;; Generated autoloads from progmodes/hideif.el (autoload 'hide-ifdef-mode "hideif" "\ @@ -13925,8 +13928,8 @@ Unconditionally turn off `hs-minor-mode'. ;;;*** -;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (21980 16567 693544 +;;;;;; 893000)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -14140,8 +14143,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** -;;;### (autoloads nil "holidays" "calendar/holidays.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "holidays" "calendar/holidays.el" (21980 16567 +;;;;;; 417544 893000)) ;;; Generated autoloads from calendar/holidays.el (defvar holiday-general-holidays (mapcar 'purecopy '((holiday-fixed 1 1 "New Year's Day") (holiday-float 1 1 3 "Martin Luther King Day") (holiday-fixed 2 2 "Groundhog Day") (holiday-fixed 2 14 "Valentine's Day") (holiday-float 2 1 3 "President's Day") (holiday-fixed 3 17 "St. Patrick's Day") (holiday-fixed 4 1 "April Fools' Day") (holiday-float 5 0 2 "Mother's Day") (holiday-float 5 1 -1 "Memorial Day") (holiday-fixed 6 14 "Flag Day") (holiday-float 6 0 3 "Father's Day") (holiday-fixed 7 4 "Independence Day") (holiday-float 9 1 1 "Labor Day") (holiday-float 10 1 2 "Columbus Day") (holiday-fixed 10 31 "Halloween") (holiday-fixed 11 11 "Veteran's Day") (holiday-float 11 4 4 "Thanksgiving"))) "\ @@ -14262,8 +14265,8 @@ Convert HTML to plain text in the current buffer. ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21794 23865 -;;;;;; 762631 503000)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21980 16567 +;;;;;; 701544 893000)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) @@ -14399,7 +14402,8 @@ bound to the current value of the filter. ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21855 577 47945 133000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21980 16640 605544 +;;;;;; 893000)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14418,7 +14422,7 @@ buffers which are visiting a file. (autoload 'ibuffer "ibuffer" "\ Begin using Ibuffer to edit a list of buffers. -Type 'h' after entering ibuffer for more information. +Type ‘h’ after entering ibuffer for more information. All arguments are optional. OTHER-WINDOW-P says to use another window. @@ -14438,8 +14442,8 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21934 -;;;;;; 7227 609892 708000)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21980 +;;;;;; 16567 421544 893000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) @@ -14492,8 +14496,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21852 24381 607274 -;;;;;; 219000)) +;;;### (autoloads nil "icomplete" "icomplete.el" (21980 16567 701544 +;;;;;; 893000)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14573,8 +14577,8 @@ with no args, if that value is non-nil. ;;;*** -;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21855 -;;;;;; 577 397944 786000)) +;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21980 +;;;;;; 16568 33544 893000)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14599,8 +14603,8 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** -;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21948 40114 -;;;;;; 438686 453000)) +;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21988 10682 +;;;;;; 41624 461000)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) @@ -14729,7 +14733,7 @@ The main features of this mode are ;;;*** -;;;### (autoloads nil "ido" "ido.el" (21909 4018 621671 120000)) +;;;### (autoloads nil "ido" "ido.el" (21981 37426 619399 97000)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14991,7 +14995,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (21855 577 47945 133000)) +;;;### (autoloads nil "ielm" "ielm.el" (21980 16567 705544 893000)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ @@ -15019,7 +15023,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "image" "image.el" (21670 32331 385639 720000)) +;;;### (autoloads nil "image" "image.el" (21974 64192 580009 993000)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15461,7 +15465,7 @@ on these modes. ;;;*** -;;;### (autoloads nil "imenu" "imenu.el" (21948 40114 294686 453000)) +;;;### (autoloads nil "imenu" "imenu.el" (21986 55346 284512 613000)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15649,7 +15653,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;*** -;;;### (autoloads nil "info" "info.el" (21931 31023 745164 572000)) +;;;### (autoloads nil "info" "info.el" (21985 34484 234705 925000)) ;;; Generated autoloads from info.el (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\ @@ -15909,8 +15913,8 @@ Perform completion on file preceding point. ;;;*** -;;;### (autoloads nil "info-xref" "info-xref.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "info-xref" "info-xref.el" (21978 61237 550488 +;;;;;; 269000)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) @@ -16202,8 +16206,8 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** -;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21855 577 527945 -;;;;;; 248000)) +;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21988 10682 +;;;;;; 97624 461000)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -16211,7 +16215,7 @@ Add submenus to the File menu, to convert to and from various formats. (defvar ispell-personal-dictionary nil "\ File name of your personal spelling dictionary, or nil. If nil, the default personal dictionary, (\"~/.ispell_DICTNAME\" for ispell or -\"~/.aspell.LANG.pws\" for aspell) is used, where DICTNAME is the name of your +\"~/.aspell.LANG.pws\" for Aspell) is used, where DICTNAME is the name of your default dictionary and LANG the two letter language code.") (custom-autoload 'ispell-personal-dictionary "ispell" t) @@ -16358,7 +16362,7 @@ Check the current buffer for spelling errors interactively. (autoload 'ispell-buffer-with-debug "ispell" "\ `ispell-buffer' with some output sent to `ispell-debug-buffer' buffer. -Use APPEND to append the info to previous buffer if exists. +If APPEND is non-n il, append the info to previous buffer if exists. \(fn &optional APPEND)" t nil) @@ -16368,8 +16372,8 @@ Continue a halted spelling session beginning with the current word. \(fn)" t nil) (autoload 'ispell-complete-word "ispell" "\ -Try to complete the word before or under point. -If optional INTERIOR-FRAG is non-nil then the word may be a character +Try to complete the word before or at point. +If optional INTERIOR-FRAG is non-nil, then the word may be a character sequence inside of a word. Standard ispell choices are then available. @@ -16404,7 +16408,7 @@ typing SPC or RET warns you if the previous word is incorrectly spelled. All the buffer-local variables and dictionaries are ignored. To -read them into the running ispell process, type \\[ispell-word] +read them into the running Ispell process, type \\[ispell-word] SPC. For spell-checking \"on the fly\", not just after typing SPC or @@ -16538,8 +16542,8 @@ by `jka-compr-installed'. ;;;*** -;;;### (autoloads nil "js" "progmodes/js.el" (21931 31023 761164 -;;;;;; 572000)) +;;;### (autoloads nil "js" "progmodes/js.el" (21976 19510 104430 +;;;;;; 241000)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) @@ -16553,7 +16557,7 @@ Major mode for editing JavaScript. ;;;*** -;;;### (autoloads nil "json" "json.el" (21779 56495 106033 935000)) +;;;### (autoloads nil "json" "json.el" (21985 34484 234705 925000)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) @@ -16637,8 +16641,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads nil "kkc" "international/kkc.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "kkc" "international/kkc.el" (21978 61237 570488 +;;;;;; 269000)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16660,7 +16664,7 @@ and the return value is the length of the conversion. ;;;*** -;;;### (autoloads nil "kmacro" "kmacro.el" (21670 32331 385639 720000)) +;;;### (autoloads nil "kmacro" "kmacro.el" (21953 58033 303058 929000)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -17000,8 +17004,8 @@ See `linum-mode' for more information on Linum mode. ;;;*** -;;;### (autoloads nil "loadhist" "loadhist.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "loadhist" "loadhist.el" (21964 28338 113695 +;;;;;; 749000)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -17408,8 +17412,8 @@ This function normally would be called when the message is sent. ;;;*** -;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "mail-utils" "mail/mail-utils.el" (21964 28338 +;;;;;; 125695 749000)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -17850,8 +17854,8 @@ recursion depth in the minibuffer prompt. This is only useful if ;;;*** -;;;### (autoloads nil "message" "gnus/message.el" (21855 576 917950 -;;;;;; 620000)) +;;;### (autoloads nil "message" "gnus/message.el" (21989 31537 871825 +;;;;;; 721000)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -18033,8 +18037,8 @@ Major mode for editing MetaPost sources. ;;;*** -;;;### (autoloads nil "metamail" "mail/metamail.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "metamail" "mail/metamail.el" (21980 16567 +;;;;;; 769544 893000)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -18065,7 +18069,7 @@ redisplayed as output is inserted. \(fn &optional VIEWMODE BUFFER NODISPLAY)" t nil) (autoload 'metamail-region "metamail" "\ -Process current region through 'metamail'. +Process current region through `metamail'. Optional argument VIEWMODE specifies the value of the EMACS_VIEW_MODE environment variable (defaulted to 1). Optional argument BUFFER specifies a buffer to be filled (nil @@ -18168,7 +18172,7 @@ delete the draft message. ;;;*** -;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21670 32331 385639 720000)) +;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21989 31537 923825 721000)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 6)) package--builtin-versions) @@ -18527,8 +18531,8 @@ Insert file contents of URL using `mm-url-program'. ;;;*** -;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21989 31537 875825 +;;;;;; 721000)) ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -18629,8 +18633,8 @@ body) or \"attachment\" (separate from the body). ;;;*** -;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21891 60465 -;;;;;; 823679 523000)) +;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21989 31537 +;;;;;; 763825 721000)) ;;; Generated autoloads from cedet/mode-local.el (put 'define-overloadable-function 'doc-string-elt 3) @@ -18671,8 +18675,8 @@ followed by the first character of the construct. ;;;*** -;;;### (autoloads nil "morse" "play/morse.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "morse" "play/morse.el" (21980 16567 969544 +;;;;;; 893000)) ;;; Generated autoloads from play/morse.el (autoload 'morse-region "morse" "\ @@ -18745,7 +18749,7 @@ To test this function, evaluate: ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21670 32331 385639 720000)) +;;;### (autoloads nil "mpc" "mpc.el" (21980 16567 797544 893000)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18765,7 +18769,7 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads nil "msb" "msb.el" (21670 32331 385639 720000)) +;;;### (autoloads nil "msb" "msb.el" (21978 61237 622488 269000)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ @@ -18790,8 +18794,8 @@ different buffer menu using the function `msb'. ;;;*** -;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21862 -;;;;;; 60209 748658 481000)) +;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21978 +;;;;;; 61237 582488 269000)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -19288,8 +19292,8 @@ asynchronously, if possible. ;;;*** -;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21670 -;;;;;; 32331 385639 720000)) +;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21980 +;;;;;; 16567 809544 893000)) ;;; Generated autoloads from net/newst-backend.el (autoload 'newsticker-running-p "newst-backend" "\ @@ -19311,7 +19315,7 @@ Run `newsticker-start-hook' if newsticker was not running already. ;;;*** ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el" -;;;;;; (21670 32331 385639 720000)) +;;;;;; (21980 16567 809544 893000)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19353,8 +19357,8 @@ running already. ;;;*** -;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21888 -;;;;;; 41565 443258 439000)) +;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21978 +;;;;;; 61237 654488 269000)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19411,7 +19415,7 @@ Generate NOV databases in all nnml directories. ;;;*** -;;;### (autoloads nil "novice" "novice.el" (21670 32331 385639 720000)) +;;;### (autoloads nil "novice" "novice.el" (21985 34484 234705 925000)) ;;; Generated autoloads from novice.el (define-obsolete-variable-alias 'disabled-command-hook 'disabled-command-function "22.1") @@ -19551,8 +19555,8 @@ the variable `nxml-enabled-unicode-blocks'. ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21888 47234 -;;;;;; 298945 440000)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21988 10682 +;;;;;; 41624 461000)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -19625,7 +19629,7 @@ Coloring: ;;;*** -;;;### (autoloads nil "org" "org/org.el" (21948 40114 382686 453000)) +;;;### (autoloads nil "org" "org/org.el" (21988 10682 25624 461000)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19846,8 +19850,8 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21862 60209 -;;;;;; 818658 502000)) +;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21988 10681 +;;;;;; 989624 461000)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -20120,8 +20124,8 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-capture" "org/org-capture.el" (21855 577 -;;;;;; 287944 835000)) +;;;### (autoloads nil "org-capture" "org/org-capture.el" (21988 10681 +;;;;;; 989624 461000)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -20227,8 +20231,8 @@ Turn on or update column view in the agenda. ;;;*** -;;;### (autoloads nil "org-compat" "org/org-compat.el" (21852 24381 -;;;;;; 787238 943000)) +;;;### (autoloads nil "org-compat" "org/org-compat.el" (21988 10681 +;;;;;; 989624 461000)) ;;; Generated autoloads from org/org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -20267,8 +20271,8 @@ The Git version of org-mode. ;;;*** -;;;### (autoloads nil "outline" "outline.el" (21720 38720 956749 -;;;;;; 443000)) +;;;### (autoloads nil "outline" "outline.el" (21981 37426 663399 +;;;;;; 97000)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -20311,8 +20315,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21930 10161 -;;;;;; 970828 320000)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21978 61237 +;;;;;; 494488 269000)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) @@ -20464,8 +20468,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "pascal" "progmodes/pascal.el" (21974 64192 +;;;;;; 644009 993000)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -20536,8 +20540,8 @@ Check if KEY is in the cache. ;;;*** -;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21888 49775 -;;;;;; 904181 796000)) +;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21980 16567 +;;;;;; 509544 893000)) ;;; Generated autoloads from emacs-lisp/pcase.el (autoload 'pcase "pcase" "\ @@ -20549,8 +20553,8 @@ Patterns can take the following forms: SYMBOL matches anything and binds it to SYMBOL. (or PAT...) matches if any of the patterns matches. (and PAT...) matches if all the patterns match. - 'VAL matches if the object is `equal' to VAL - ATOM is a shorthand for 'ATOM. + \\='VAL matches if the object is `equal' to VAL + ATOM is a shorthand for \\='ATOM. ATOM can be a keyword, an integer, or a string. (pred FUN) matches if FUN applied to the object returns non-nil. (guard BOOLEXP) matches if BOOLEXP evaluates to non-nil. @@ -20638,8 +20642,8 @@ to this macro. ;;;*** -;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21857 42300 397266 -;;;;;; 599000)) +;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21980 16567 953544 +;;;;;; 893000)) ;;; Generated autoloads from pcmpl-cvs.el (autoload 'pcomplete/cvs "pcmpl-cvs" "\ @@ -20765,8 +20769,8 @@ Includes files as well as host names followed by a colon. ;;;*** -;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "pcmpl-x" "pcmpl-x.el" (21980 16567 953544 +;;;;;; 893000)) ;;; Generated autoloads from pcmpl-x.el (autoload 'pcomplete/tlmgr "pcmpl-x" "\ @@ -20776,7 +20780,7 @@ Completion for the `tlmgr' command. (autoload 'pcomplete/ack "pcmpl-x" "\ Completion for the `ack' command. -Start an argument with '-' to complete short options and '--' for +Start an argument with `-' to complete short options and `--' for long options. \(fn)" nil nil) @@ -20790,8 +20794,8 @@ Completion for the `ag' command. ;;;*** -;;;### (autoloads nil "pcomplete" "pcomplete.el" (21688 62278 418203 -;;;;;; 119000)) +;;;### (autoloads nil "pcomplete" "pcomplete.el" (21980 16567 953544 +;;;;;; 893000)) ;;; Generated autoloads from pcomplete.el (autoload 'pcomplete "pcomplete" "\ @@ -20848,7 +20852,7 @@ Setup `shell-mode' to use pcomplete. ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21670 32331 885635 586000)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21985 34484 302705 925000)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -21075,8 +21079,8 @@ they are not by default assigned to keys. ;;;*** -;;;### (autoloads nil "pinentry" "net/pinentry.el" (21890 39605 414073 -;;;;;; 663000)) +;;;### (autoloads nil "pinentry" "net/pinentry.el" (21972 22452 338264 +;;;;;; 357000)) ;;; Generated autoloads from net/pinentry.el (push (purecopy '(pinentry 0 1)) package--builtin-versions) @@ -21134,7 +21138,7 @@ pong-mode keybindings:\\ ;;;*** -;;;### (autoloads nil "pop3" "gnus/pop3.el" (21670 32331 385639 720000)) +;;;### (autoloads nil "pop3" "gnus/pop3.el" (21974 64192 580009 993000)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -21196,8 +21200,8 @@ Ignores leading comment characters. ;;;*** -;;;### (autoloads nil "printing" "printing.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "printing" "printing.el" (21981 37426 679399 +;;;;;; 97000)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) @@ -21785,7 +21789,7 @@ are both set to t. ;;;*** -;;;### (autoloads nil "proced" "proced.el" (21670 32331 385639 720000)) +;;;### (autoloads nil "proced" "proced.el" (21981 37426 683399 97000)) ;;; Generated autoloads from proced.el (autoload 'proced "proced" "\ @@ -21832,8 +21836,8 @@ Open profile FILENAME. ;;;*** -;;;### (autoloads nil "project" "progmodes/project.el" (21947 19252 -;;;;;; 629252 749000)) +;;;### (autoloads nil "project" "progmodes/project.el" (21960 31281 +;;;;;; 344212 153000)) ;;; Generated autoloads from progmodes/project.el (autoload 'project-current "project" "\ @@ -21843,8 +21847,8 @@ Return the project instance in DIR or `default-directory'. ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21955 13362 +;;;;;; 392569 401000)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21935,8 +21939,8 @@ Typing \\\\[ps-run-goto-error] when the cursor is at the number ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (21948 40114 490686 -;;;;;; 453000)) +;;;### (autoloads nil "ps-print" "ps-print.el" (21981 37426 699399 +;;;;;; 97000)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) @@ -22133,8 +22137,8 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (21834 32653 960520 -;;;;;; 248000)) +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21968 25395 287570 +;;;;;; 741000)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) @@ -22152,10 +22156,10 @@ Optional argument FACE specifies the face to do the highlighting. ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21915 42801 -;;;;;; 68409 735000)) +;;;### (autoloads nil "python" "progmodes/python.el" (21980 16568 +;;;;;; 37544 893000)) ;;; Generated autoloads from progmodes/python.el -(push (purecopy '(python 0 24 5)) package--builtin-versions) +(push (purecopy '(python 0 25 1)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) @@ -22209,8 +22213,8 @@ them into characters should be done separately. ;;;*** -;;;### (autoloads nil "quail" "international/quail.el" (21829 62890 -;;;;;; 321199 861000)) +;;;### (autoloads nil "quail" "international/quail.el" (21988 10681 +;;;;;; 981624 461000)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -22440,8 +22444,8 @@ of each directory. ;;;*** -;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21770 -;;;;;; 41522 196747 399000)) +;;;### (autoloads nil "quail/hangul" "leim/quail/hangul.el" (21953 +;;;;;; 58033 331058 929000)) ;;; Generated autoloads from leim/quail/hangul.el (autoload 'hangul-input-method-activate "quail/hangul" "\ @@ -22540,8 +22544,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** -;;;### (autoloads nil "rcirc" "net/rcirc.el" (21930 10161 986828 -;;;;;; 320000)) +;;;### (autoloads nil "rcirc" "net/rcirc.el" (21980 16567 809544 +;;;;;; 893000)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -22579,8 +22583,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21670 -;;;;;; 32330 885624 725000)) +;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21976 +;;;;;; 19509 900430 241000)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias 'regexp-builder 're-builder) @@ -22598,8 +22602,8 @@ matching parts of the target buffer will be highlighted. ;;;*** -;;;### (autoloads nil "recentf" "recentf.el" (21852 24381 997231 -;;;;;; 450000)) +;;;### (autoloads nil "recentf" "recentf.el" (21981 37426 699399 +;;;;;; 97000)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -22786,8 +22790,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead. ;;;*** -;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21833 60086 -;;;;;; 84775 646000)) +;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21980 16640 +;;;;;; 469544 893000)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'reftex-citation "reftex-cite" nil t) (autoload 'reftex-all-document-files "reftex-parse") @@ -23059,8 +23063,8 @@ the mode if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21670 32330 885624 -;;;;;; 725000)) +;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21976 19509 900430 +;;;;;; 241000)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload 'ring-p "ring" "\ @@ -23075,8 +23079,8 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads nil "rlogin" "net/rlogin.el" (21852 24381 727234 -;;;;;; 912000)) +;;;### (autoloads nil "rlogin" "net/rlogin.el" (21978 61237 654488 +;;;;;; 269000)) ;;; Generated autoloads from net/rlogin.el (autoload 'rlogin "rlogin" "\ @@ -23120,8 +23124,8 @@ variable. ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21862 60482 540812 -;;;;;; 493000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21989 31537 903825 +;;;;;; 721000)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23318,8 +23322,8 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** -;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "rmailout" "mail/rmailout.el" (21989 31537 +;;;;;; 907825 721000)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -23383,8 +23387,8 @@ than appending to it. Deletes the message after writing if ;;;*** -;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21670 32331 -;;;;;; 385639 720000)) +;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (21978 61237 +;;;;;; 666488 269000)) ;;; Generated autoloads from nxml/rng-cmpct.el (autoload 'rng-c-load-schema "rng-cmpct" "\ @@ -23467,8 +23471,8 @@ must be equal. ;;;*** -;;;### (autoloads nil "robin" "international/robin.el" (21824 5851 -;;;;;; 711914 99000)) +;;;### (autoloads nil "robin" "international/robin.el" (21953 58033 +;;;;;; 303058 929000)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -23537,8 +23541,8 @@ Toggle the use of ROT13 encoding for the current window. ;;;*** -;;;### (autoloads nil "rst" "textmodes/rst.el" (21852 24382 77263 -;;;;;; 112000)) +;;;### (autoloads nil "rst" "textmodes/rst.el" (21955 13362 436569 +;;;;;; 401000)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -23568,8 +23572,8 @@ for modes derived from Text mode, like Mail mode. ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21855 -;;;;;; 577 437945 800000)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21955 +;;;;;; 13362 400569 401000)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) @@ -23605,8 +23609,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21807 35879 352666 -;;;;;; 863000)) +;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21980 16567 509544 +;;;;;; 893000)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -23924,8 +23928,8 @@ enclosed in `(and ...)'. ;;;*** -;;;### (autoloads nil "savehist" "savehist.el" (21670 32331 885635 -;;;;;; 586000)) +;;;### (autoloads nil "savehist" "savehist.el" (21981 37426 703399 +;;;;;; 97000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) @@ -24164,8 +24168,8 @@ Major mode for editing Wisent grammars. ;;;*** -;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21861 39358 -;;;;;; 517945 150000)) +;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21964 28338 +;;;;;; 141695 749000)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -24446,14 +24450,14 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** -;;;### (autoloads nil "seq" "emacs-lisp/seq.el" (21909 4018 525671 -;;;;;; 120000)) +;;;### (autoloads nil "seq" "emacs-lisp/seq.el" (21982 58292 436758 +;;;;;; 717000)) ;;; Generated autoloads from emacs-lisp/seq.el -(push (purecopy '(seq 1 8)) package--builtin-versions) +(push (purecopy '(seq 2 0)) package--builtin-versions) ;;;*** -;;;### (autoloads nil "server" "server.el" (21916 4736 887897 451000)) +;;;### (autoloads nil "server" "server.el" (21981 37426 703399 97000)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -24520,7 +24524,7 @@ only these files will be asked to be saved. ;;;*** -;;;### (autoloads nil "ses" "ses.el" (21855 577 487945 652000)) +;;;### (autoloads nil "ses" "ses.el" (21981 37426 711399 97000)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -24564,21 +24568,21 @@ formula: ;;;*** -;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21939 -;;;;;; 25137 195448 264000)) +;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21988 +;;;;;; 10682 97624 461000)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ Major mode for editing SGML documents. Makes > match <. -Keys <, &, SPC within <>, \", / and ' can be electric depending on +Keys <, &, SPC within <>, \", / and \\=' can be electric depending on `sgml-quick-keys'. An argument of N to a tag-inserting command means to wrap it around the next N words. In Transient Mark mode, when the mark is active, N defaults to -1, which means to wrap it around the current region. -If you like upcased tags, put (setq sgml-transformation-function 'upcase) +If you like upcased tags, put (setq sgml-transformation-function \\='upcase) in your init file. Use \\[sgml-validate] to validate your document with an SGML parser. @@ -24622,7 +24626,7 @@ Images in many formats can be inlined with . If you mainly create your own documents, `sgml-specials' might be interesting. But note that some HTML 2 browsers can't handle `''. To work around that, do: - (eval-after-load \"sgml-mode\" '(aset sgml-char-names ?' nil)) + (eval-after-load \"sgml-mode\" '(aset sgml-char-names ?\\=' nil)) \\{html-mode-map} @@ -24630,8 +24634,8 @@ To work around that, do: ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21880 -;;;;;; 3758 862057 0)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21965 +;;;;;; 49202 339586 285000)) ;;; Generated autoloads from progmodes/sh-script.el (push (purecopy '(sh-script 2 0 6)) package--builtin-versions) (put 'sh-shell 'safe-local-variable 'symbolp) @@ -24694,8 +24698,8 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21670 32330 -;;;;;; 885624 725000)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21980 16567 +;;;;;; 509544 893000)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24717,7 +24721,7 @@ For example, suppose `load-path' is set to and that each of these directories contains a file called XXX.el. Then XXX.el in the site-lisp directory is referred to by all of: -\(require 'XXX), (autoload .... \"XXX\"), (load-library \"XXX\") etc. +\(require \\='XXX), (autoload .... \"XXX\"), (load-library \"XXX\") etc. The first XXX.el file prevents Emacs from seeing the second (unless the second is loaded explicitly via `load-file'). @@ -24848,8 +24852,8 @@ DOM should be a parse tree as generated by ;;;*** -;;;### (autoloads nil "sieve" "gnus/sieve.el" (21670 32331 385639 -;;;;;; 720000)) +;;;### (autoloads nil "sieve" "gnus/sieve.el" (21972 22452 270264 +;;;;;; 357000)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -24939,8 +24943,8 @@ with no arguments, if that value is non-nil. ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (21939 25137 183448 -;;;;;; 264000)) +;;;### (autoloads nil "skeleton" "skeleton.el" (21980 16568 61544 +;;;;;; 893000)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function 'identity "\ @@ -25442,7 +25446,7 @@ is non-nil, it also prints a message describing the number of deletions. ;;;*** -;;;### (autoloads nil "spam" "gnus/spam.el" (21832 3464 481922 546000)) +;;;### (autoloads nil "spam" "gnus/spam.el" (21981 37426 607399 97000)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -25456,8 +25460,8 @@ installed through `spam-necessary-extra-headers'. ;;;*** -;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21670 -;;;;;; 32331 385639 720000)) +;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21989 +;;;;;; 31537 879825 721000)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -25540,8 +25544,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (21765 23600 805241 -;;;;;; 145000)) +;;;### (autoloads nil "sql" "progmodes/sql.el" (21980 16568 41544 +;;;;;; 893000)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 5)) package--builtin-versions) @@ -25590,7 +25594,7 @@ Note that SQL doesn't have an escape character unless you specify one. If you specify backslash as escape character in SQL, you must tell Emacs. Here's how to do that in your init file: -\(add-hook 'sql-mode-hook +\(add-hook \\='sql-mode-hook (lambda () (modify-syntax-entry ?\\\\ \".\" sql-mode-syntax-table))) @@ -26015,7 +26019,7 @@ Run vsql as an inferior process. ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (21891 60465 835679 523000)) +;;;;;; (21978 61237 382488 269000)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -26051,8 +26055,8 @@ GnuTLS requires a port number. ;;;*** -;;;### (autoloads nil "strokes" "strokes.el" (21670 32331 885635 -;;;;;; 586000)) +;;;### (autoloads nil "strokes" "strokes.el" (21981 37426 735399 +;;;;;; 97000)) ;;; Generated autoloads from strokes.el (autoload 'strokes-global-set-stroke "strokes" "\ @@ -26370,8 +26374,8 @@ The variable `tab-width' controls the spacing of tab stops. ;;;*** -;;;### (autoloads nil "table" "textmodes/table.el" (21948 40114 526686 -;;;;;; 453000)) +;;;### (autoloads nil "table" "textmodes/table.el" (21974 64192 704009 +;;;;;; 993000)) ;;; Generated autoloads from textmodes/table.el (autoload 'table-insert "table" "\ @@ -26684,15 +26688,15 @@ ORIENTATION is a symbol either horizontally or vertically. (autoload 'table-justify "table" "\ Justify contents of a cell, a row of cells or a column of cells. -WHAT is a symbol 'cell, 'row or 'column. JUSTIFY is a symbol 'left, -'center, 'right, 'top, 'middle, 'bottom or 'none. +WHAT is a symbol ‘cell’, ‘row’ or ‘column’. JUSTIFY is a symbol +‘left’, ‘center’, ‘right’, ‘top’, ‘middle’, ‘bottom’ or ‘none’. \(fn WHAT JUSTIFY)" t nil) (autoload 'table-justify-cell "table" "\ Justify cell contents. -JUSTIFY is a symbol 'left, 'center or 'right for horizontal, or 'top, -'middle, 'bottom or 'none for vertical. When optional PARAGRAPH is +JUSTIFY is a symbol ‘left’, ‘center’ or ‘right’ for horizontal, or ‘top’, +‘middle’, ‘bottom’ or ‘none’ for vertical. When optional PARAGRAPH is non-nil the justify operation is limited to the current paragraph, otherwise the entire cell contents is justified. @@ -26700,15 +26704,15 @@ otherwise the entire cell contents is justified. (autoload 'table-justify-row "table" "\ Justify cells of a row. -JUSTIFY is a symbol 'left, 'center or 'right for horizontal, or top, -'middle, 'bottom or 'none for vertical. +JUSTIFY is a symbol ‘left’, ‘center’ or ‘right’ for horizontal, +or ‘top’, ‘middle’, ‘bottom’ or ‘none’ for vertical. \(fn JUSTIFY)" t nil) (autoload 'table-justify-column "table" "\ Justify cells of a column. -JUSTIFY is a symbol 'left, 'center or 'right for horizontal, or top, -'middle, 'bottom or 'none for vertical. +JUSTIFY is a symbol ‘left’, ‘center’ or ‘right’ for horizontal, +or ‘top’, ‘middle’, ‘bottom’ or ‘none’ for vertical. \(fn JUSTIFY)" t nil) @@ -26781,8 +26785,8 @@ INTERVAL is the number of cells to travel between sequence element insertion which is normally 1. When zero or less is given for INTERVAL it is interpreted as number of cells per row so that sequence is placed straight down vertically as long as the table's cell -structure is uniform. JUSTIFY is one of the symbol 'left, 'center or -'right, that specifies justification of the inserted string. +structure is uniform. JUSTIFY is a symbol ‘left’, ‘center’ or +‘right’ that specifies justification of the inserted string. Example: @@ -27056,7 +27060,7 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads nil "term" "term.el" (21798 49947 262665 54000)) +;;;### (autoloads nil "term" "term.el" (21953 58033 491058 929000)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -27098,8 +27102,8 @@ use in that buffer. ;;;*** -;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21834 -;;;;;; 29303 521933 754000)) +;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21976 +;;;;;; 19509 908430 241000)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -27135,8 +27139,8 @@ tetris-mode keybindings: ;;;*** -;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21862 60209 -;;;;;; 908658 140000)) +;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21980 16568 +;;;;;; 85544 893000)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27299,7 +27303,7 @@ says which mode to use. Major mode for editing files of input for plain TeX. Makes $ and } display the characters they match. Makes \" insert \\=`\\=` when it seems to be the beginning of a quotation, -and '' when it appears to be the end; it inserts \" only after a \\. +and \\='\\=' when it appears to be the end; it inserts \" only after a \\. Use \\[tex-region] to run TeX on the current region, plus a \"header\" copied from the top of the file (containing macro definitions, etc.), @@ -27342,7 +27346,7 @@ special subshell is initiated, the hook `tex-shell-hook' is run. Major mode for editing files of input for LaTeX. Makes $ and } display the characters they match. Makes \" insert \\=`\\=` when it seems to be the beginning of a quotation, -and '' when it appears to be the end; it inserts \" only after a \\. +and \\='\\=' when it appears to be the end; it inserts \" only after a \\. Use \\[tex-region] to run LaTeX on the current region, plus the preamble copied from the top of the file (containing \\documentstyle, etc.), @@ -27385,7 +27389,7 @@ subshell is initiated, `tex-shell-hook' is run. Major mode for editing files of input for SliTeX. Makes $ and } display the characters they match. Makes \" insert \\=`\\=` when it seems to be the beginning of a quotation, -and '' when it appears to be the end; it inserts \" only after a \\. +and \\='\\=' when it appears to be the end; it inserts \" only after a \\. Use \\[tex-region] to run SliTeX on the current region, plus the preamble copied from the top of the file (containing \\documentstyle, etc.), @@ -27437,8 +27441,8 @@ Major mode to edit DocTeX files. ;;;*** -;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21907 48688 -;;;;;; 825360 195000)) +;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21988 10682 +;;;;;; 101624 461000)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -27477,8 +27481,8 @@ if large. You can use `Info-split' to do this manually. ;;;*** -;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21862 60209 -;;;;;; 928657 362000)) +;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21980 16568 +;;;;;; 89544 893000)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote (purecopy "``") "\ @@ -27655,7 +27659,7 @@ Return the Lisp list at point, or nil if none is found. ;;;*** -;;;### (autoloads nil "thumbs" "thumbs.el" (21670 32331 885635 586000)) +;;;### (autoloads nil "thumbs" "thumbs.el" (21974 64192 708009 993000)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -27892,8 +27896,8 @@ Return a string giving the duration of the Emacs initialization. ;;;*** -;;;### (autoloads nil "time-date" "calendar/time-date.el" (21670 -;;;;;; 32330 885624 725000)) +;;;### (autoloads nil "time-date" "calendar/time-date.el" (21976 +;;;;;; 19509 736430 241000)) ;;; Generated autoloads from calendar/time-date.el (autoload 'date-to-time "time-date" "\ @@ -27996,8 +28000,8 @@ Convert the time interval in seconds to a short string. ;;;*** -;;;### (autoloads nil "time-stamp" "time-stamp.el" (21942 1330 821986 -;;;;;; 820000)) +;;;### (autoloads nil "time-stamp" "time-stamp.el" (21980 16568 89544 +;;;;;; 893000)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p) @@ -28012,7 +28016,7 @@ Convert the time interval in seconds to a short string. Update the time stamp string(s) in the buffer. A template in a file can be automatically updated with a new time stamp every time you save the file. Add this line to your init file: - (add-hook 'before-save-hook 'time-stamp) + (add-hook \\='before-save-hook \\='time-stamp) or customize `before-save-hook' through Custom. Normally the template must appear in the first 8 lines of a file and look like one of the following: @@ -28037,8 +28041,8 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;*** -;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21670 -;;;;;; 32330 885624 725000)) +;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21980 +;;;;;; 16567 425544 893000)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) @@ -28148,7 +28152,7 @@ relative only to the time worked today, and not to past time. ;;;*** ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el" -;;;;;; (21874 379 470923 336000)) +;;;;;; (21988 10681 981624 461000)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -28212,8 +28216,8 @@ Its value should be an event that has a binding in MENU. ;;;*** -;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21893 -;;;;;; 15793 471985 415000)) +;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21985 +;;;;;; 34484 214705 925000)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-show "todo-mode" "\ @@ -28411,8 +28415,8 @@ the output buffer or changing the window configuration. ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21945 63921 461174 -;;;;;; 555000)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21981 37426 655399 +;;;;;; 97000)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28538,8 +28542,8 @@ Discard Tramp from loading remote files. ;;;*** -;;;### (autoloads nil "tutorial" "tutorial.el" (21670 32331 885635 -;;;;;; 586000)) +;;;### (autoloads nil "tutorial" "tutorial.el" (21978 61237 774488 +;;;;;; 269000)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -28574,8 +28578,8 @@ resumed later. ;;;*** -;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21670 -;;;;;; 32331 885635 586000)) +;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21988 +;;;;;; 10682 101624 461000)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -28622,8 +28626,8 @@ First column's text sSs Second column's text ;;;*** -;;;### (autoloads nil "type-break" "type-break.el" (21855 577 527945 -;;;;;; 248000)) +;;;### (autoloads nil "type-break" "type-break.el" (21976 19510 152430 +;;;;;; 241000)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28936,8 +28940,8 @@ no further processing). URL is either a string or a parsed URL. ;;;*** -;;;### (autoloads nil "url-auth" "url/url-auth.el" (21670 32331 885635 -;;;;;; 586000)) +;;;### (autoloads nil "url-auth" "url/url-auth.el" (21989 31537 943825 +;;;;;; 721000)) ;;; Generated autoloads from url/url-auth.el (autoload 'url-get-authentication "url-auth" "\ @@ -28948,12 +28952,12 @@ URL is the url you are requesting authorization to. This can be either a string representing the URL, or the parsed representation returned by `url-generic-parse-url' REALM is the realm at a specific site we are looking for. This should be a - string specifying the exact realm, or nil or the symbol 'any' to + string specifying the exact realm, or nil or the symbol `any' to specify that the filename portion of the URL should be used as the realm TYPE is the type of authentication to be returned. This is either a string - representing the type (basic, digest, etc), or nil or the symbol 'any' - to specify that any authentication is acceptable. If requesting 'any' + representing the type (basic, digest, etc), or nil or the symbol `any' + to specify that any authentication is acceptable. If requesting `any' the strongest matching authentication will be returned. If this is wrong, it's no big deal, the error from the server will specify exactly what type of auth to use @@ -29543,8 +29547,8 @@ This uses `url-current-object', set locally to the buffer. ;;;*** -;;;### (autoloads nil "userlock" "userlock.el" (21670 32331 885635 -;;;;;; 586000)) +;;;### (autoloads nil "userlock" "userlock.el" (21976 19510 152430 +;;;;;; 241000)) ;;; Generated autoloads from userlock.el (autoload 'ask-user-about-lock "userlock" "\ @@ -29997,8 +30001,8 @@ Name of the format file in a .bzr directory.") ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21826 49707 480493 -;;;;;; 554000)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21985 34484 302705 +;;;;;; 925000)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) "Return non-nil if file F is registered with CVS." @@ -30145,8 +30149,8 @@ For a description of possible values, see `vc-check-master-templates'.") ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21916 4736 891897 -;;;;;; 451000)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21980 16568 97544 +;;;;;; 893000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -30219,7 +30223,7 @@ Key bindings: ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (21862 60209 898658 614000)) +;;;;;; (21988 10682 49624 461000)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30358,8 +30362,8 @@ Key bindings specific to `verilog-mode-map' are: ;;;*** -;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21948 -;;;;;; 40114 482686 453000)) +;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21988 +;;;;;; 10682 57624 461000)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -30470,7 +30474,7 @@ Usage: according to option `vhdl-argument-list-indent'. If option `vhdl-indent-tabs-mode' is nil, spaces are used instead of - tabs. `M-x tabify' and `M-x untabify' allow to convert spaces to tabs + tabs. `\\[tabify]' and `\\[untabify]' allow to convert spaces to tabs and vice versa. Syntax-based indentation can be very slow in large files. Option @@ -30781,7 +30785,7 @@ Usage: `vhdl-highlight-translate-off' is non-nil. For documentation and customization of the used colors see - customization group `vhdl-highlight-faces' (`M-x customize-group'). For + customization group `vhdl-highlight-faces' (`\\[customize-group]'). For highlighting of matching parenthesis, see customization group `paren-showing'. Automatic buffer highlighting is turned on/off by option `global-font-lock-mode' (`font-lock-auto-fontify' in XEmacs). @@ -30841,14 +30845,14 @@ Usage: sessions using the \"Save Options\" menu entry. Options and their detailed descriptions can also be accessed by using - the \"Customize\" menu entry or the command `M-x customize-option' (`M-x - customize-group' for groups). Some customizations only take effect + the \"Customize\" menu entry or the command `\\[customize-option]' + (`\\[customize-group]' for groups). Some customizations only take effect after some action (read the NOTE in the option documentation). Customization can also be done globally (i.e. site-wide, read the INSTALL file). Not all options are described in this documentation, so go and see - what other useful user options there are (`M-x vhdl-customize' or menu)! + what other useful user options there are (`\\[vhdl-customize]' or menu)! FILE EXTENSIONS: @@ -30877,7 +30881,7 @@ Usage: Maintenance: ------------ -To submit a bug report, enter `M-x vhdl-submit-bug-report' within VHDL Mode. +To submit a bug report, enter `\\[vhdl-submit-bug-report]' within VHDL Mode. Add a description of the problem and include a reproducible test case. Questions and enhancement requests can be sent to . @@ -31232,8 +31236,8 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'. ;;;*** -;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21884 -;;;;;; 813 562651 696000)) +;;;### (autoloads nil "warnings" "emacs-lisp/warnings.el" (21986 +;;;;;; 55346 260512 613000)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -31292,9 +31296,9 @@ See also `warning-series', `warning-prefix-function' and \(fn TYPE MESSAGE &optional LEVEL BUFFER-NAME)" nil nil) (autoload 'lwarn "warnings" "\ -Display a warning message made from (format MESSAGE ARGS...). +Display a warning message made from (format-message MESSAGE ARGS...). \\ -Aside from generating the message with `format', +Aside from generating the message with `format-message', this is equivalent to `display-warning'. TYPE is the warning type: either a custom group name (a symbol), @@ -31314,8 +31318,8 @@ LEVEL should be either :debug, :warning, :error, or :emergency \(fn TYPE LEVEL MESSAGE &rest ARGS)" nil nil) (autoload 'warn "warnings" "\ -Display a warning message made from (format MESSAGE ARGS...). -Aside from generating the message with `format', +Display a warning message made from (format-message MESSAGE ARGS...). +Aside from generating the message with `format-message', this is equivalent to `display-warning', using `emacs' as the type and `:warning' as the level. @@ -31323,7 +31327,7 @@ this is equivalent to `display-warning', using ;;;*** -;;;### (autoloads nil "wdired" "wdired.el" (21670 32331 885635 586000)) +;;;### (autoloads nil "wdired" "wdired.el" (21981 37426 739399 97000)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) @@ -31358,8 +31362,8 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** -;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21670 -;;;;;; 32331 885635 586000)) +;;;### (autoloads nil "which-func" "progmodes/which-func.el" (21986 +;;;;;; 55346 292512 613000)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -31389,8 +31393,8 @@ in certain major modes. ;;;*** -;;;### (autoloads nil "whitespace" "whitespace.el" (21918 18992 845579 -;;;;;; 660000)) +;;;### (autoloads nil "whitespace" "whitespace.el" (21985 34484 306705 +;;;;;; 925000)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) @@ -31787,8 +31791,8 @@ if ARG is omitted or nil. ;;;*** -;;;### (autoloads nil "wid-edit" "wid-edit.el" (21891 60465 939679 -;;;;;; 523000)) +;;;### (autoloads nil "wid-edit" "wid-edit.el" (21981 37426 739399 +;;;;;; 97000)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -31906,7 +31910,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. ;;;*** -;;;### (autoloads nil "woman" "woman.el" (21855 577 547944 710000)) +;;;### (autoloads nil "woman" "woman.el" (21985 34484 338705 925000)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) @@ -31955,7 +31959,7 @@ Default bookmark handler for Woman buffers. ;;;*** -;;;### (autoloads nil "xml" "xml.el" (21670 32331 885635 586000)) +;;;### (autoloads nil "xml" "xml.el" (21974 64192 720009 993000)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -31972,8 +31976,8 @@ URIs, and expanded names will be returned as a cons If PARSE-NS is an alist, it will be used as the mapping from namespace to URIs instead. -If it is the symbol 'symbol-qnames, expanded names will be -returned as a plain symbol 'namespace:foo instead of a cons. +If it is the symbol `symbol-qnames', expanded names will be +returned as a plain symbol `namespace:foo' instead of a cons. Both features can be combined by providing a cons cell @@ -32000,8 +32004,8 @@ URIs, and expanded names will be returned as a cons If PARSE-NS is an alist, it will be used as the mapping from namespace to URIs instead. -If it is the symbol 'symbol-qnames, expanded names will be -returned as a plain symbol 'namespace:foo instead of a cons. +If it is the symbol `symbol-qnames', expanded names will be +returned as a plain symbol `namespace:foo' instead of a cons. Both features can be combined by providing a cons cell @@ -32030,8 +32034,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT. ;;;*** -;;;### (autoloads nil "xref" "progmodes/xref.el" (21947 19252 629252 -;;;;;; 749000)) +;;;### (autoloads nil "xref" "progmodes/xref.el" (21963 7479 570964 +;;;;;; 861000)) ;;; Generated autoloads from progmodes/xref.el (autoload 'xref-pop-marker-stack "xref" "\ @@ -32049,6 +32053,13 @@ Find the definition of the identifier at point. With prefix argument or when there's no identifier at point, prompt for it. +If the backend has sufficient information to determine a unique +definition for IDENTIFIER, it returns only that definition. If +there are multiple possible definitions, it returns all of them. + +If the backend returns one definition, jump to it; otherwise, +display the list in a buffer. + \(fn IDENTIFIER)" t nil) (autoload 'xref-find-definitions-other-window "xref" "\ @@ -32357,7 +32368,7 @@ Zone out, completely. ;;;;;; "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el" ;;;;;; "vc/pcvs-util.el" "vc/vc-dav.el" "vc/vc-filewise.el" "vcursor.el" ;;;;;; "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el" -;;;;;; "x-dnd.el") (21948 40114 418686 453000)) +;;;;;; "x-dnd.el") (21989 31602 291825 721000)) ;;;*** commit a9713f202ee9b21dae837b96863e1c1e18c7040a Author: Stephen Leake Date: Tue Sep 1 05:12:24 2015 -0500 Improve comments in elisp-mode.el, elisp-mode-tests.el * lisp/progmodes/elisp-mode.el: Clean up FIXMEs, comments. diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index e76728d..bcabf3c 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -653,7 +653,8 @@ non-nil result supercedes the xrefs produced by ;; FIXME: advised function; list of advice functions - ;; FIXME: aliased variable + ;; Coding system symbols do not appear in ‘load-history’, + ;; so we can’t get a location for them. (when (and (symbolp symbol) (symbol-function symbol) diff --git a/test/automated/elisp-mode-tests.el b/test/automated/elisp-mode-tests.el index ec01477..7886b55 100644 --- a/test/automated/elisp-mode-tests.el +++ b/test/automated/elisp-mode-tests.el @@ -125,7 +125,7 @@ (cl-case type (defalias ;; summary: "(defalias xref)" - ;; target : "(defalias 'xref)" + ;; target : "(defalias 'xref" (concat "(defalias '" (substring (xref-item-summary xref) 10 -1))) (defun @@ -211,7 +211,7 @@ to (xref-elisp-test-descr-to-target xref)." ;; alphabetical by test name -;; FIXME: autoload +;; Autoloads require no special support; they are handled as functions. ;; FIXME: defalias-defun-c cmpl-prefix-entry-head ;; FIXME: defalias-defvar-el allout-mode-map commit 4257c29d5eaa1f4ead3b58022127efb8c57b39e2 Author: Stephen Leake Date: Tue Sep 1 05:10:52 2015 -0500 Delete Emacs 25 test in mode-local.el * lisp/cedet/mode-local.el (describe-mode-local-overload): Fix missed an edit in previous commit. diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index 95cf65f..72512c6 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -643,13 +643,11 @@ SYMBOL is a function that can be overridden." (insert (overload-docstring-extension symbol) "\n\n") (insert (format-message "default function: `%s'\n" default)) - (when (and (boundp 'describe-function-orig-buffer) ;; added in Emacs 25 - describe-function-orig-buffer) - (if override - (insert (format-message "\noverride in buffer '%s': `%s'\n" - describe-function-orig-buffer override)) - (insert (format-message "\nno override in buffer '%s'\n" - describe-function-orig-buffer)))) + (if override + (insert (format-message "\noverride in buffer '%s': `%s'\n" + describe-function-orig-buffer override)) + (insert (format-message "\nno override in buffer '%s'\n" + describe-function-orig-buffer))) (mapatoms (lambda (sym) (when (get sym 'mode-local-symbol-table) (push sym modes))) commit fcdd22dd4be2312aace9cce724f8ae8128b585ac Author: Stephen Leake Date: Tue Sep 1 04:36:05 2015 -0500 Show all known mode-local overrides in *Help* * lisp/cedet/mode-local.el (describe-mode-local-overload): Assume Emacs 25. Add all known mode-local overrides. diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index 287e655..95cf65f 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -637,11 +637,10 @@ SYMBOL is a function that can be overridden." (when (get symbol 'mode-local-overload) (let ((default (or (intern-soft (format "%s-default" (symbol-name symbol))) symbol)) - (override (and - (boundp 'describe-function-orig-buffer) ;; added in Emacs 25 - describe-function-orig-buffer - (with-current-buffer describe-function-orig-buffer - (fetch-overload symbol))))) + (override (with-current-buffer describe-function-orig-buffer + (fetch-overload symbol))) + modes) + (insert (overload-docstring-extension symbol) "\n\n") (insert (format-message "default function: `%s'\n" default)) (when (and (boundp 'describe-function-orig-buffer) ;; added in Emacs 25 @@ -651,6 +650,19 @@ SYMBOL is a function that can be overridden." describe-function-orig-buffer override)) (insert (format-message "\nno override in buffer '%s'\n" describe-function-orig-buffer)))) + + (mapatoms + (lambda (sym) (when (get sym 'mode-local-symbol-table) (push sym modes))) + obarray) + + (dolist (mode modes) + (let* ((major-mode mode) + (override (fetch-overload symbol))) + + (when override + (insert (format-message "\noverride in mode ‘%s’: ’%s’\n" + major-mode override)) + ))) ))) (add-hook 'help-fns-describe-function-functions 'describe-mode-local-overload)