commit dbb29d7eb428dd53617d31a9cc159d889deb1e8e (HEAD, refs/remotes/origin/master) Author: Tom Tromey Date: Mon Jan 16 15:59:06 2017 -0700 Add info-lookup help for gdb-script-mode Bug#25464: * lisp/info-look.el (info-lookup-guess-gdb-script-symbol): New function. Add help for gdb-script-mode. diff --git a/lisp/info-look.el b/lisp/info-look.el index 1f3c50870e..694bcb462c 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -43,6 +43,7 @@ ;;; Code: (require 'info) +(require 'subr-x) (defgroup info-lookup nil "Major mode sensitive help agent." @@ -648,6 +649,26 @@ Return nil if there is nothing appropriate in the buffer near point." (buffer-substring-no-properties beg end))))) (error nil))) +(defun info-lookup-guess-gdb-script-symbol () + "Get symbol at point in GDB script buffers." + (condition-case nil + (save-excursion + (back-to-indentation) + ;; Try to find the current line's full command in the index; + ;; and default to the longest subset that is found. + (when (looking-at "[-a-z]+\\(\\s-[-a-z]+\\)*") + (let ((str-list (split-string (match-string-no-properties 0) + "\\s-+" t)) + (completions (info-lookup->completions 'symbol + 'gdb-script-mode))) + (catch 'result + (while str-list + (let ((str (string-join str-list " "))) + (when (assoc str completions) + (throw 'result str)) + (nbutlast str-list))))))) + (error nil))) + ;;;###autoload (defun info-complete-symbol (&optional mode) "Perform completion on symbol preceding point." @@ -1051,6 +1072,14 @@ Return nil if there is nothing appropriate in the buffer near point." :mode 'help-mode :regexp "[^][()`'‘’,:\" \t\n]+" :other-modes '(emacs-lisp-mode)) + +(info-lookup-maybe-add-help + :mode 'gdb-script-mode + :ignore-case nil + :regexp "\\([-a-z]+\\(\\s-+[-a-z]+\\)*\\)" + :doc-spec '(("(gdb)Command and Variable Index" nil + nil nil)) + :parse-rule 'info-lookup-guess-gdb-script-symbol) (provide 'info-look) commit 8083d258ba96065ac5a201a69f34f7a4d92fe24c Author: Tom Tromey Date: Mon Jan 16 17:17:38 2017 -0700 Treat ":root" as a css-selector * lisp/textmodes/css-mode.el (css--font-lock-keywords): Recognize bare ":root" as selector. diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 872d115f29..c81c3f62e1 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -666,6 +666,8 @@ cannot be completed sensibly: `custom-ident', ;; Variables. (,(concat "--" css-ident-re) (0 font-lock-variable-name-face)) ;; Selectors. + ;; Allow plain ":root" as a selector. + ("^[ \t]*\\(:root\\)\\(?:[\n \t]*\\)*{" (1 'css-selector keep)) ;; FIXME: attribute selectors don't work well because they may contain ;; strings which have already been highlighted as f-l-string-face and ;; thus prevent this highlighting from being applied (actually now that commit aa711e0a92c30914e1c68cf39251638d4faee22d Author: Tom Tromey Date: Mon Jan 16 14:02:45 2017 -0700 Fix JS regexp literal syntax propertization in expressions Bug#25465: * lisp/progmodes/js.el (js-syntax-propertize): Recognize a regexp literal after "!", "&", and "|". test/lisp/progmodes/js-tests.el (js-mode-regexp-syntax): New test. diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 54df3913fc..2e5c6ae119 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1720,10 +1720,10 @@ This performs fontification according to `js--class-styles'." ;; Distinguish /-division from /-regexp chars (and from /-comment-starter). ;; FIXME: Allow regexps after infix ops like + ... ;; https://developer.mozilla.org/en/JavaScript/Reference/Operators - ;; We can probably just add +, -, !, <, >, %, ^, ~, |, &, ?, : at which + ;; We can probably just add +, -, <, >, %, ^, ~, ?, : at which ;; point I think only * and / would be missing which could also be added, ;; but need care to avoid affecting the // and */ comment markers. - ("\\(?:^\\|[=([{,:;]\\|\\_\\)\\(?:[ \t]\\)*\\(/\\)[^/*]" + ("\\(?:^\\|[=([{,:;|&!]\\|\\_\\)\\(?:[ \t]\\)*\\(/\\)[^/*]" (1 (ignore (forward-char -1) (when (or (not (memq (char-after (match-beginning 0)) '(?\s ?\t))) diff --git a/test/lisp/progmodes/js-tests.el b/test/lisp/progmodes/js-tests.el index 9bf7258eeb..84749efa45 100644 --- a/test/lisp/progmodes/js-tests.el +++ b/test/lisp/progmodes/js-tests.el @@ -59,6 +59,32 @@ * Load the inspector's shared head.js for use by tests that need to * open the something or other")))) +(ert-deftest js-mode-regexp-syntax () + (with-temp-buffer + ;; Normally indentation tests are done in manual/indent, but in + ;; this case we are specifically testing a case where the bug + ;; caused the indenter not to do anything, and manual/indent can + ;; only be used for already-correct files. + (insert "function f(start, value) { +if (start - 1 === 0 || /[ (:,='\"]/.test(value)) { +--start; +} +if (start - 1 === 0 && /[ (:,='\"]/.test(value)) { +--start; +} +if (!/[ (:,='\"]/.test(value)) { +--start; +} +} +") + (js-mode) + (indent-region (point-min) (point-max)) + (goto-char (point-min)) + (dolist (x '(0 4 8 4 4 8 4 4 8 4 0)) + (back-to-indentation) + (should (= (current-column) x)) + (forward-line)))) + (provide 'js-tests) ;;; js-tests.el ends here commit 14c7d3a6e0581fd26254cd316fd369c9c3651146 Author: Mark Oteiza Date: Tue Jan 17 15:19:30 2017 -0500 Mark unused arguments and remove unused variables * lisp/play/dunnet.el (dun-mode, dun-die, dun-inven, dun-try-take): (dun-dig, dun-type, dun-n, dun-s, dun-e, dun-w, dun-ne, dun-se): (dun-nw, dun-sw, dun-up, dun-down, dun-in, dun-out, dun-long): (dun-swim, dun-score, dun-flush, dun-piss, dun-sleep, dun-drive): (dun-superb, dun-power, dun-unix-parse, dun-bin, dun-fascii): (dun-ftpquit, dun-ftphelp, dun-uexit, dun-pwd, dun-dos-parse): (dun-dos-invd, dun-dos-spawn, dun-dos-exit, dun-dos-nil): (dungeon-nil): Mark arguments as unused. (dun-drop, dun-objnum-from-args, dun-get-path, dun-ftp): (dun-restore): Remove unused variable. diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el index 37dcba6142..981b8464aa 100644 --- a/lisp/play/dunnet.el +++ b/lisp/play/dunnet.el @@ -50,7 +50,7 @@ (make-local-variable 'scroll-step) (setq scroll-step 2)) -(defun dun-parse (arg) +(defun dun-parse (_arg) "Function called when return is pressed in interactive mode to parse line." (interactive "*p") (beginning-of-line) @@ -210,13 +210,13 @@ disk bursts into flames, and disintegrates.") (dun-score nil) (setq dun-dead t)) -(defun dun-quit (args) +(defun dun-quit (_args) (dun-die nil)) ;;; Print every object in player's inventory. Special case for the jar, ;;; as we must also print what is in it. -(defun dun-inven (args) +(defun dun-inven (_args) (dun-mprinc "You currently have:") (dun-mprinc "\n") (dolist (curobj dun-inventory) @@ -265,7 +265,7 @@ on your head.") (defun dun-drop (obj) (if dun-inbus (dun-mprincl "You can't drop anything while on the bus.") - (let (objnum ptr) + (let (objnum) (when (setq objnum (dun-objnum-from-args-std obj)) (if (not (setq ptr (member objnum dun-inventory))) (dun-mprincl "You don't have that.") @@ -412,10 +412,10 @@ For an explosive time, go to Fourth St. and Vermont.") ;;; We try to take an object that is untakable. Print a message ;;; depending on what it is. -(defun dun-try-take (obj) +(defun dun-try-take (_obj) (dun-mprinc "You cannot take that.")) -(defun dun-dig (args) +(defun dun-dig (_args) (if dun-inbus (dun-mprincl "Digging here reveals nothing.") (if (not (member 0 dun-inventory)) @@ -557,7 +557,7 @@ with a bang. The key seems to have vanished!") just try dropping it.") (dun-mprincl"You can't put that there."))))))))))) -(defun dun-type (args) +(defun dun-type (_args) (if (not (= dun-current-room computer-room)) (dun-mprincl "There is nothing here on which you could type.") (if (not dun-computer) @@ -567,40 +567,40 @@ just try dropping it.") ;;; Various movement directions -(defun dun-n (args) +(defun dun-n (_args) (dun-move north)) -(defun dun-s (args) +(defun dun-s (_args) (dun-move south)) -(defun dun-e (args) +(defun dun-e (_args) (dun-move east)) -(defun dun-w (args) +(defun dun-w (_args) (dun-move west)) -(defun dun-ne (args) +(defun dun-ne (_args) (dun-move northeast)) -(defun dun-se (args) +(defun dun-se (_args) (dun-move southeast)) -(defun dun-nw (args) +(defun dun-nw (_args) (dun-move northwest)) -(defun dun-sw (args) +(defun dun-sw (_args) (dun-move southwest)) -(defun dun-up (args) +(defun dun-up (_args) (dun-move up)) -(defun dun-down (args) +(defun dun-down (_args) (dun-move down)) -(defun dun-in (args) +(defun dun-in (_args) (dun-move in)) -(defun dun-out (args) +(defun dun-out (_args) (dun-move out)) (defun dun-go (args) @@ -774,7 +774,7 @@ engulf you, and you burn to death.") huge rocks sliding down from the ceiling, and blocking your way out.\n") (setq dun-current-room misty-room))))) -(defun dun-long (args) +(defun dun-long (_args) (setq dun-mode "long")) (defun dun-turn (obj) @@ -867,7 +867,7 @@ as you release it, the passageway closes.")) (dun-mprincl "The button is now in the on position.") (setq dun-black t)))))))) -(defun dun-swim (args) +(defun dun-swim (_args) (if (not (member dun-current-room (list lakefront-north lakefront-south))) (dun-mprincl "I see no water!") (if (not (member obj-life dun-inventory)) @@ -882,7 +882,7 @@ to swim.") (setq dun-current-room lakefront-north))))) -(defun dun-score (args) +(defun dun-score (_args) (if (not dun-endgame) (let (total) (setq total (dun-reg-score)) @@ -896,7 +896,7 @@ to swim.") (dun-mprincl "\n\nCongratulations. You have won. The wizard password is ‘moby’")))) -(defun dun-help (args) +(defun dun-help (_args) (dun-mprincl "Welcome to dunnet (2.02), by Ron Schnell (ronnie@driver-aces.com - @RonnieSchnell). Here is some useful information (read carefully because there are one @@ -937,14 +937,14 @@ If you have questions or comments, please contact ronnie@driver-aces.com My home page is http://www.driver-aces.com/ronnie.html ")) -(defun dun-flush (args) +(defun dun-flush (_args) (if (not (= dun-current-room bathroom)) (dun-mprincl "I see nothing to flush.") (dun-mprincl "Whoooosh!!") (dun-put-objs-in-treas (nth urinal dun-room-objects)) (dun-replace dun-room-objects urinal nil))) -(defun dun-piss (args) +(defun dun-piss (_args) (if (not (= dun-current-room bathroom)) (dun-mprincl "You can't do that here, don't even bother trying.") (if (not dun-gottago) @@ -956,7 +956,7 @@ My home page is http://www.driver-aces.com/ronnie.html (list obj-URINE)))))) -(defun dun-sleep (args) +(defun dun-sleep (_args) (if (not (= dun-current-room bedroom)) (dun-mprincl "You try to go to sleep while standing up here, but can't seem to do it.") @@ -1012,12 +1012,12 @@ for a moment, then straighten yourself up. (dun-mprincl "Your axe breaks it into a million pieces.") (dun-remove-obj-from-room dun-current-room objnum))))))))) -(defun dun-drive (args) +(defun dun-drive (_args) (if (not dun-inbus) (dun-mprincl "You cannot drive when you aren't in a vehicle.") (dun-mprincl "To drive while you are in the bus, just give a direction."))) -(defun dun-superb (args) +(defun dun-superb (_args) (setq dun-mode 'dun-superb)) (defun dun-reg-score () @@ -1073,7 +1073,7 @@ for a moment, then straighten yourself up. (setq i (1+ i))) (setq dun-endgame-questions newques)))) -(defun dun-power (args) +(defun dun-power (_args) (if (not (= dun-current-room pc-area)) (dun-mprincl "That operation is not applicable here.") (if (not dun-floppy) @@ -1221,11 +1221,10 @@ for a moment, then straighten yourself up. ;;; words in the command, except for the verb. (defun dun-objnum-from-args (obj) - (let (objnum) - (setq obj (dun-firstword obj)) - (if (not obj) - obj-special - (setq objnum (cdr (assq (intern obj) dun-objnames)))))) + (setq obj (dun-firstword obj)) + (if (not obj) + obj-special + (cdr (assq (intern obj) dun-objnames)))) (defun dun-objnum-from-args-std (obj) (let (result) @@ -1251,7 +1250,7 @@ for a moment, then straighten yourself up. ;;; Given a unix style pathname, build a list of path components (recursive) (defun dun-get-path (dirstring startlist) - (let (slash pos) + (let (slash) (if (= (length dirstring) 0) startlist (if (string= (substring dirstring 0 1) "/") @@ -2480,7 +2479,7 @@ treasures for points?" "4" "four") ;;;; This section defines the UNIX emulation functions for dunnet. ;;;; -(defun dun-unix-parse (args) +(defun dun-unix-parse (_args) (interactive "*p") (beginning-of-line) (let (beg esign) @@ -2693,7 +2692,7 @@ drwxr-xr-x 3 root staff 2048 Jan 1 1970 ..") (defun dun-ftp (args) - (let (host username passwd ident newlist) + (let (host username ident newlist) (if (not (car args)) (dun-mprincl "ftp: hostname required on command line.") (setq host (intern (car args))) @@ -2768,15 +2767,15 @@ drwxr-xr-x 3 root staff 2048 Jan 1 1970 ..") (dun-fascii 'nil) (dun-mprincl "Unknown type."))))) -(defun dun-bin (args) +(defun dun-bin (_args) (dun-mprincl "Type set to binary.") (setq dun-ftptype 'binary)) -(defun dun-fascii (args) +(defun dun-fascii (_args) (dun-mprincl "Type set to ascii.") (setq dun-ftptype 'ascii)) -(defun dun-ftpquit (args) +(defun dun-ftpquit (_args) (setq dun-exitf t)) (defun dun-send (args) @@ -2831,18 +2830,18 @@ drwxr-xr-x 3 root staff 2048 Jan 1 1970 ..") (if (not foo) (dun-mprincl "No such file.")))))) -(defun dun-ftphelp (args) +(defun dun-ftphelp (_args) (dun-mprincl "Possible commands are:\nsend quit type ascii binary help")) -(defun dun-uexit (args) +(defun dun-uexit (_args) (setq dungeon-mode 'dungeon) (dun-mprincl "\nYou step back from the console.") (define-key dun-mode-map "\r" 'dun-parse) (if (not dun-batch-mode) (dun-messages))) -(defun dun-pwd (args) +(defun dun-pwd (_args) (dun-mprincl dun-cdpath)) (defun dun-uncompress (args) @@ -3009,7 +3008,7 @@ drwxr-xr-x 3 root staff 2048 Jan 1 1970 ..") ;;;; This section defines the DOS emulation functions for dunnet ;;;; -(defun dun-dos-parse (args) +(defun dun-dos-parse (_args) (interactive "*p") (beginning-of-line) (let (beg) @@ -3047,7 +3046,7 @@ drwxr-xr-x 3 root staff 2048 Jan 1 1970 ..") (dun-mprincl (upcase args)))) (dun-mprincl "Must supply file name"))) -(defun dun-dos-invd (args) +(defun dun-dos-invd (_args) (sleep-for 1) (dun-mprincl "Invalid drive specification")) @@ -3084,11 +3083,11 @@ File not found"))) (if (not dun-batch-mode) (dun-mprinc "\n"))) -(defun dun-dos-spawn (args) +(defun dun-dos-spawn (_args) (sleep-for 1) (dun-mprincl "Cannot spawn subshell")) -(defun dun-dos-exit (args) +(defun dun-dos-exit (_args) (setq dungeon-mode 'dungeon) (dun-mprincl "\nYou power down the machine and step back.") (define-key dun-mode-map "\r" 'dun-parse) @@ -3106,7 +3105,7 @@ File not found"))) (dun-mprinc dun-combination) (dun-mprinc ".\n")) -(defun dun-dos-nil (args)) +(defun dun-dos-nil (_args)) ;;;; @@ -3203,7 +3202,7 @@ File not found"))) (defun dun-do-logfile (type how) - (let (ferror newscore) + (let (ferror) (setq ferror nil) (switch-to-buffer (get-buffer-create "*score*")) (erase-buffer) @@ -3229,8 +3228,8 @@ File not found"))) (dun-minsert (cadr (nth (abs room) dun-rooms))) (dun-minsert ". score: ") (if (> (dun-endgame-score) 0) - (dun-minsert (setq newscore (+ 90 (dun-endgame-score)))) - (dun-minsert (setq newscore (dun-reg-score)))) + (dun-minsert (+ 90 (dun-endgame-score))) + (dun-minsert (dun-reg-score))) (dun-minsert " saves: ") (dun-minsert dun-numsaves) (dun-minsert " commands: ") @@ -3316,7 +3315,7 @@ File not found"))) (goto-char (point-max)) (dun-mprinc "\n")))) -(defun dungeon-nil (arg) +(defun dungeon-nil (_arg) "noop" (interactive "*p") nil) commit 299b190a6b54ae6df5a5d38205c3137b6578689d Author: Michael Albinus Date: Tue Jan 17 17:35:23 2017 +0100 Fix auto-save-file-name problem in Tramp on MS Windows * lisp/files.el (make-auto-save-file-name): Use `file-remote-p' rather than an ange-ftp regexp. * lisp/net/tramp.el (tramp-handle-make-auto-save-file-name): Fix a problem when running on MS Windows. * test/lisp/net/tramp-tests.el (tramp-test31-make-auto-save-file-name): Adapt test. diff --git a/lisp/files.el b/lisp/files.el index b57e35b9a0..f60282b775 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -6074,8 +6074,8 @@ See also `auto-save-file-name-p'." ;; Make sure auto-save file names don't contain characters ;; invalid for the underlying filesystem. (if (and (memq system-type '(ms-dos windows-nt cygwin)) - ;; Don't modify remote (ange-ftp) filenames - (not (string-match "^/\\w+@[-A-Za-z0-9._]+:" result))) + ;; Don't modify remote filenames + (not (file-remote-p result))) (convert-standard-filename result) result)))) @@ -6112,8 +6112,8 @@ See also `auto-save-file-name-p'." ((file-writable-p "/var/tmp/") "/var/tmp/") ("~/"))))) (if (and (memq system-type '(ms-dos windows-nt cygwin)) - ;; Don't modify remote (ange-ftp) filenames - (not (string-match "^/\\w+@[-A-Za-z0-9._]+:" fname))) + ;; Don't modify remote filenames + (not (file-remote-p fname))) ;; The call to convert-standard-filename is in case ;; buffer-name includes characters not allowed by the ;; DOS/Windows filesystems. make-temp-file writes to the diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 3697d50429..fc7fdd3085 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4063,7 +4063,11 @@ this file, if that variable is non-nil." (file-exists-p tramp-auto-save-directory)) (make-directory tramp-auto-save-directory t)) - (let ((system-type 'not-windows) + (let ((system-type + (if (and (stringp tramp-auto-save-directory) + (file-remote-p tramp-auto-save-directory)) + 'not-windows + system-type)) (auto-save-file-name-transforms (if (null tramp-auto-save-directory) auto-save-file-name-transforms)) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 02e5d18b7f..0c3068aeb0 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -1991,12 +1991,16 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (string-equal (make-auto-save-file-name) ;; This is taken from original `make-auto-save-file-name'. - (expand-file-name - (format - "#%s#" - (subst-char-in-string - ?/ ?! (replace-regexp-in-string "!" "!!" tmp-name1))) - temporary-file-directory))))) + ;; We call `convert-standard-filename', because on + ;; MS Windows the (local) colons must be replaced by + ;; exclamation marks. + (convert-standard-filename + (expand-file-name + (format + "#%s#" + (subst-char-in-string + ?/ ?! (replace-regexp-in-string "!" "!!" tmp-name1))) + temporary-file-directory)))))) ;; No mapping. (let (tramp-auto-save-directory auto-save-file-name-transforms) commit 021d340cf94f6670f1c45175e856f3394f7fcae1 Author: Paul Eggert Date: Tue Jan 17 07:45:39 2017 -0800 ; Spelling fixes diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 06f969d278..261e98eabc 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -109,7 +109,7 @@ (def-edebug-spec push (&or [form symbolp] [form gv-place])) -;; Correct wrong declaration. This still doesn't support dotted desctructuring +;; Correct wrong declaration. This still doesn't support dotted destructuring ;; though. (def-edebug-spec cl-lambda-list (([&rest cl-macro-arg] @@ -1006,7 +1006,7 @@ BEG-UND are the starting points of the overline or underline, respectively. They may be nil if the respective thing is missing. BEG-TXT is the beginning of the title line or the transition and must be given. The end of the line is used as the end point. TXT -is the title text or nil. If TXT is given the indendation of the +is the title text or nil. If TXT is given the indentation of the line containing BEG-TXT is used as indentation. Match group 0 is derived from the remaining information." (cl-check-type beg-txt integer-or-marker) @@ -1845,8 +1845,7 @@ Uses and sets `rst-all-ttls-cache'." HDRS reflects the order in which the headers appear in the buffer. Return a `rst-Hdr' list representing the hierarchy of headers in the buffer. Indentation is unified." - (let (ado2indents) ; Asscociates `rst-Ado' with the set of indents seen for - ; it. + (let (ado2indents) ; Associates `rst-Ado' with the set of indents seen for it. (dolist (hdr hdrs) (let* ((ado (rst-Hdr-ado hdr)) (indent (rst-Hdr-indent hdr)) @@ -2451,7 +2450,7 @@ also arranged by `rst-insert-list-new-tag'." (defun rst-insert-list-continue (ind tag tab prefer-roman) ;; testcover: ok. "Insert a new list tag after the current line according to style. -Style is defined by indentaton IND, TAG and suffix TAB. If +Style is defined by indentation IND, TAG and suffix TAB. If PREFER-ROMAN roman numbering is preferred over using letters." (end-of-line) (insert @@ -2551,8 +2550,8 @@ roman numerical list, just use a prefix to set PREFER-ROMAN." "Return the positions of begs in region BEG to END. RST-RE-BEG is a `rst-re' argument and matched at the beginning of a line. Return a list of (POINT . COLUMN) where POINT gives the -point after indentaton and COLUMN gives its column. The list is -ordererd by POINT." +point after indentation and COLUMN gives its column. The list is +ordered by POINT." (let (r) (save-match-data (save-excursion @@ -2963,7 +2962,7 @@ error if there is no working link at the given position." (unless link-buf (setq link-buf (current-buffer))) ;; Do not catch errors from `rst-toc-get-link' because otherwise the error is - ;; suppressed and invisible in interactve use. + ;; suppressed and invisible in interactive use. (let ((mrkr (rst-toc-get-link link-buf link-pnt))) (condition-case nil (rst-toc-mode-return kill) commit 2b36ae07e3c8106e4603b330fc470f0595d28de0 Merge: dee6981c8d 42614fafa2 Author: Paul Eggert Date: Tue Jan 17 07:34:25 2017 -0800 Merge from origin/emacs-25 42614fa Update remaining copyright years with admin.el M-x set-copyright f17a006 * lisp/ffap.el (ffap-lax-url): Bump :version after recent cha... commit dee6981c8de6347ef66a9a1c37d65c43a9a8c4a6 Merge: 5362ef79cb 8dd624c8ac Author: Paul Eggert Date: Tue Jan 17 07:32:13 2017 -0800 ; Merge from origin/emacs-25 The following commit was skipped: 8dd624c Document that functions in 'ffap-alist' can use the match data commit 42614fafa273f9a692c42c4dd1220e0db49e7a4c Author: Glenn Morris Date: Wed Jan 4 14:10:34 2017 -0500 Update remaining copyright years with admin.el M-x set-copyright * etc/refcards/ru-refcard.tex (cyear): Set to 2017. diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 9324c4b491..700a2096a5 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -41,7 +41,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{25} % version of Emacs this is for -\newcommand{\cyear}[0]{2016} % copyright year +\newcommand{\cyear}[0]{2017} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. commit f17a0069f941f14126e4f4bbcabae36a425308f2 Author: Glenn Morris Date: Wed Jan 4 13:32:18 2017 -0500 * lisp/ffap.el (ffap-lax-url): Bump :version after recent change. diff --git a/lisp/ffap.el b/lisp/ffap.el index c1fab70fe9..8b48d71bae 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -170,7 +170,7 @@ this to nil will disable recognition of URLs that are not well-formed, such as \"user@host\" or \"\"." :type 'boolean :group 'ffap - :version "25.1") + :version "25.2") ; nil -> t (defcustom ffap-ftp-default-user "anonymous" "User name in FTP file names generated by `ffap-host-to-path'. commit 8dd624c8ac179d5381e00c04358d353866f60f9f Author: Philipp Stephani Date: Tue Jan 3 17:19:36 2017 +0100 Document that functions in 'ffap-alist' can use the match data * lisp/ffap.el (ffap-alist): Document that ffap sets the match data while walking 'ffap-alist'. diff --git a/lisp/ffap.el b/lisp/ffap.el index 76e86ef951..c1fab70fe9 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -792,7 +792,10 @@ specify actions to try creating such a string. A pair matches if either KEY is a symbol, and it equals `major-mode', or KEY is a string, it should match NAME as a regexp. On a match, (FUNCTION NAME) is called and should return a file, an -URL, or nil. If nil, search the alist for further matches.") +URL, or nil. If nil, search the alist for further matches. +While calling FUNCTION, the match data is set according to KEY if KEY +is a string, so that FUNCTION can use `match-string' and friends +to extract substrings.") (put 'ffap-alist 'risky-local-variable t)