commit f97628f58e520c13b70ff618dda34e66da3dc81b (HEAD, refs/remotes/origin/master) Author: Stefan Monnier Date: Wed May 8 15:18:32 2019 -0400 * lisp/emacs-lisp/syntax.el (syntax-propertize): `ignore` is like nil (syntax-ppss-after-change-function): Mark it as obsolete. * lisp/font-lock.el (font-lock-apply-syntactic-highlight): Use syntax-ppss-flush-cache instead. diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index d09d6c1225..f1904e64ef 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -286,7 +286,7 @@ END) suitable for `syntax-propertize-function'." (defun syntax-propertize (pos) "Ensure that syntax-table properties are set until POS (a buffer point)." (when (< syntax-propertize--done pos) - (if (null syntax-propertize-function) + (if (memq syntax-propertize-function '(nil ignore)) (setq syntax-propertize--done (max (point-max) pos)) ;; (message "Needs to syntax-propertize from %s to %s" ;; syntax-propertize--done pos) @@ -404,7 +404,8 @@ These are valid when the buffer has no restriction.") (defvar-local syntax-ppss-narrow-start nil "Start position of the narrowing for `syntax-ppss-narrow'.") -(defalias 'syntax-ppss-after-change-function 'syntax-ppss-flush-cache) +(define-obsolete-function-alias 'syntax-ppss-after-change-function + #'syntax-ppss-flush-cache "27.1") (defun syntax-ppss-flush-cache (beg &rest ignored) "Flush the cache of `syntax-ppss' starting at position BEG." ;; Set syntax-propertize to refontify anything past beg. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index d0f7096ab8..7ff4e606fa 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1501,7 +1501,7 @@ see `font-lock-syntactic-keywords'." ;; Flush the syntax-cache. I believe this is not necessary for ;; font-lock's use of syntax-ppss, but I'm not 100% sure and it can ;; still be necessary for other users of syntax-ppss anyway. - (syntax-ppss-after-change-function start) + (syntax-ppss-flush-cache start) (cond ((not override) ;; Cannot override existing fontification. commit caa28f031b65ff6512e777f8996d7f3c3144c17a Author: Paul Eggert Date: Wed May 8 08:37:40 2019 -0700 Port LIBRSVG_CHECK_VERSION fix to picky cpp * src/image.c (LIBRSVG_CHECK_VERSION): Define to yield false if it isn’t already defined. (svg_load_image): Port to C preprocessors that check the syntax of the entire preprocessing expression before evaluating any of it. diff --git a/src/image.c b/src/image.c index 725eb4b8d0..e8cb434177 100644 --- a/src/image.c +++ b/src/image.c @@ -9248,6 +9248,11 @@ svg_image_p (Lisp_Object object) # include +/* librsvg is too old for us if it doesn't define this macro. */ +# ifndef LIBRSVG_CHECK_VERSION +# define LIBRSVG_CHECK_VERSION(v, w, x) false +# endif + # ifdef WINDOWSNT /* Restore the original definition of __MINGW_MAJOR_VERSION. */ @@ -9465,8 +9470,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, #if GNUC_PREREQ (4, 6, 0) #pragma GCC diagnostic push #endif - #if defined LIBRSVG_CHECK_VERSION && LIBRSVG_CHECK_VERSION (2, 45, 1) \ - && GNUC_PREREQ (4, 2, 0) + #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif commit 8b789755b45e6e10ed2809d7a7b89146b28452fc Merge: 6734f2168c 1c6484e975 Author: Glenn Morris Date: Wed May 8 07:51:48 2019 -0700 Merge from origin/emacs-26 1c6484e (origin/emacs-26) Fix incorrect cloning of eieio-instance-inh... 37436fe Fix cloning of eieio-named objects (Bug#22840) fb65a36 Fix ibuffer-unmark-backward synopsis (bug#35572) f77bd2b ; * src/lisp.h (DEFSYM): Fix inaccurate comment. 3b86e0b Clarify handling of long options (Bug#24949) 04340a8 Improve documentation of the daemon and emacsclient 3e29de2 * etc/NEWS.24: Belatedly announce delete-consecutive-dups. commit 6734f2168c5f4f68a15325215c2054e7006f0e82 Merge: d9d914b292 0ae7b2b88f Author: Glenn Morris Date: Wed May 8 07:51:48 2019 -0700 ; Merge from origin/emacs-26 The following commits were skipped: 0ae7b2b (emacs-26) ; Auto-commit of loaddefs files. 3e322df * admin/update_autogen: Handle git worktree. commit d9d914b29297ced7bace3e90f384b905ebd8e45d Merge: c4d1697f9a ec02c736d6 Author: Glenn Morris Date: Wed May 8 07:51:46 2019 -0700 Merge from origin/emacs-26 ec02c73 Update process filter example (Bug#35044) commit c4d1697f9a92cc90571dd3944af38726a31adb17 Author: Eli Zaretskii Date: Wed May 8 16:20:36 2019 +0300 ; * lisp/help.el (view-lossage): Fix commentary. (Bug#35596) diff --git a/lisp/help.el b/lisp/help.el index 4dfe471c10..2b7eca9363 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -480,7 +480,7 @@ To record all your input, use `open-dribble-file'." (while (not (eobp)) (comment-indent) (forward-line 1))) - ;; jidanni wants to see the last keystrokes immediately. + ;; Show point near the end of "lossage", as we did in Emacs 24. (set-marker help-window-point-marker (point))))) commit 04f9e0b516ea70ac674f0c0ac2fe779630503a3f Author: Eli Zaretskii Date: Wed May 8 16:03:08 2019 +0300 Fix compilation with old versions of librsvg * src/image.c (svg_load_image): Use LIBRSVG_CHECK_VERSION only if it's defined; it isn't in old versions of librsvg. diff --git a/src/image.c b/src/image.c index 3d724a773b..725eb4b8d0 100644 --- a/src/image.c +++ b/src/image.c @@ -9465,7 +9465,8 @@ svg_load_image (struct frame *f, struct image *img, char *contents, #if GNUC_PREREQ (4, 6, 0) #pragma GCC diagnostic push #endif - #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0) + #if defined LIBRSVG_CHECK_VERSION && LIBRSVG_CHECK_VERSION (2, 45, 1) \ + && GNUC_PREREQ (4, 2, 0) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif commit 1c6484e975e8b0e50d22980d02a3be6c9bf93b49 Author: Vitalie Spinu Date: Wed May 8 11:12:29 2019 +0200 Fix incorrect cloning of eieio-instance-inheritor objects (Bug#34840) * lisp/emacs-lisp/eieio-base.el (clone): Unbound slots of eieio-instance-inheritor objects as documented in the docs string and implemented in the original eieio implementation. diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index 3aeda92db1..62f4c82026 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -64,10 +64,18 @@ SLOT-NAME is the offending slot. FN is the function signaling the error." ;; Throw the regular signal. (cl-call-next-method))) -(cl-defmethod clone ((obj eieio-instance-inheritor) &rest _params) +(cl-defmethod clone ((obj eieio-instance-inheritor) &rest params) "Clone OBJ, initializing `:parent' to OBJ. All slots are unbound, except those initialized with PARAMS." - (let ((nobj (cl-call-next-method))) + ;; call next method without params as we makeunbound slots anyhow + (let ((nobj (if (stringp (car params)) + (cl-call-next-method obj (pop params)) + (cl-call-next-method obj)))) + (dolist (descriptor (eieio-class-slots (class-of nobj))) + (let ((slot (eieio-slot-descriptor-name descriptor))) + (slot-makeunbound nobj slot))) + (when params + (shared-initialize nobj params)) (oset nobj parent-instance obj) nobj)) diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el index 0c7b6b71c3..1084c99dd5 100644 --- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el +++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el @@ -696,6 +696,17 @@ Do not override for `prot-2'." (setq eitest-II3 (clone eitest-II2 "eitest-II3 Test.")) (oset eitest-II3 slot3 'penguin) + ;; Test that slots are non-initialized slots are unbounded + (oref eitest-II2 slot1) + (should (slot-boundp eitest-II2 'slot1)) + (should-not (slot-boundp eitest-II2 'slot2)) + (should-not (slot-boundp eitest-II2 'slot3)) + (should-not (slot-boundp eitest-II3 'slot2)) + (should-not (slot-boundp eitest-II3 'slot1)) + (should-not (slot-boundp eitest-II3 'slot2)) + (should (eieio-instance-inheritor-slot-boundp eitest-II3 'slot2)) + (should (slot-boundp eitest-II3 'slot3)) + ;; Test level 1 inheritance (should (eq (oref eitest-II3 slot1) 'moose)) ;; Test level 2 inheritance @@ -913,6 +924,36 @@ Subclasses to override slot attributes.") (should (string= "aa-1" (oref D object-name))) (should (string= "aa-2" (oref E object-name))))) +(defclass TII (eieio-instance-inheritor) + ((a :initform 1 :initarg :a) + (b :initarg :b) + (c :initarg :c)) + "Instance Inheritor test class.") + +(ert-deftest eieio-test-39-clone-instance-inheritor-with-args () + (let* ((A (TII)) + (B (clone A :b "bb")) + (C (clone B :a "aa"))) + + (should (string= "aa" (oref C :a))) + (should (string= "bb" (oref C :b))) + + (should (slot-boundp A :a)) + (should-not (slot-boundp A :b)) + (should-not (slot-boundp A :c)) + + (should-not (slot-boundp B :a)) + (should (slot-boundp B :b)) + (should-not (slot-boundp A :c)) + + (should (slot-boundp C :a)) + (should-not (slot-boundp C :b)) + (should-not (slot-boundp C :c)) + + (should (eieio-instance-inheritor-slot-boundp C :a)) + (should (eieio-instance-inheritor-slot-boundp C :b)) + (should-not (eieio-instance-inheritor-slot-boundp C :c)))) + (provide 'eieio-tests) commit 0728b40cc7b4e171281f7394aa4993b199166b90 Author: Michael Albinus Date: Wed May 8 10:49:31 2019 +0200 ; Instrument auto-revert--deftest-remote diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el index af9edac1be..8cdddf824d 100644 --- a/test/lisp/autorevert-tests.el +++ b/test/lisp/autorevert-tests.el @@ -140,6 +140,7 @@ This expects `auto-revert--messages' to be bound by `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () ,docstring :tags '(:expensive-test) + (condition-case err (let ((temporary-file-directory auto-revert-test-remote-temporary-file-directory) (auto-revert-remote-files t) @@ -148,7 +149,8 @@ This expects `auto-revert--messages' to be bound by (skip-unless (auto-revert--test-enabled-remote)) (tramp-cleanup-connection (tramp-dissect-file-name temporary-file-directory) nil 'keep-password) - (funcall (ert-test-body ert-test))))) + (funcall (ert-test-body ert-test))) + (error (message "%s" err))))) (ert-deftest auto-revert-test00-auto-revert-mode () "Check autorevert for a file." commit 37436fe6d32539b03d1c4dbd535d5409bef5ac09 Author: Vitalie Spinu Date: Tue May 7 13:15:43 2019 +0200 Fix cloning of eieio-named objects (Bug#22840) * lisp/emacs-lisp/eieio-base.el (clone): Correctly set the name of the cloned objects from eieio-named instances. diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index 7a9f905c6f..3aeda92db1 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -510,16 +510,18 @@ instance." All slots are unbound, except those initialized with PARAMS." (let* ((newname (and (stringp (car params)) (pop params))) (nobj (apply #'cl-call-next-method obj params)) - (nm (slot-value obj 'object-name))) - (eieio-oset obj 'object-name + (nm (slot-value nobj 'object-name))) + (eieio-oset nobj 'object-name (or newname - (save-match-data - (if (and nm (string-match "-\\([0-9]+\\)" nm)) - (let ((num (1+ (string-to-number - (match-string 1 nm))))) - (concat (substring nm 0 (match-beginning 0)) - "-" (int-to-string num))) - (concat nm "-1"))))) + (if (equal nm (slot-value obj 'object-name)) + (save-match-data + (if (and nm (string-match "-\\([0-9]+\\)" nm)) + (let ((num (1+ (string-to-number + (match-string 1 nm))))) + (concat (substring nm 0 (match-beginning 0)) + "-" (int-to-string num))) + (concat nm "-1"))) + nm))) nobj)) (cl-defmethod make-instance ((class (subclass eieio-named)) &rest args) diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el index 09ee123efa..0c7b6b71c3 100644 --- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el +++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el @@ -862,8 +862,7 @@ Subclasses to override slot attributes.") (should (oref obj1 a-slot)))) (defclass NAMED (eieio-named) - ((some-slot :initform nil) - ) + ((some-slot :initform nil)) "A class inheriting from eieio-named.") (ert-deftest eieio-test-35-named-object () @@ -902,6 +901,18 @@ Subclasses to override slot attributes.") (should (fboundp 'eieio--defalias))) +(ert-deftest eieio-test-38-clone-named-object () + (let* ((A (NAMED :object-name "aa")) + (B (clone A :object-name "bb")) + (C (clone A "cc")) + (D (clone A)) + (E (clone D))) + (should (string= "aa" (oref A object-name))) + (should (string= "bb" (oref B object-name))) + (should (string= "cc" (oref C object-name))) + (should (string= "aa-1" (oref D object-name))) + (should (string= "aa-2" (oref E object-name))))) + (provide 'eieio-tests) commit fb65a36f4587726b3de0df02daf02c28e9129f62 Author: Basil L. Contovounesios Date: Tue May 7 01:40:22 2019 +0100 Fix ibuffer-unmark-backward synopsis (bug#35572) * lisp/ibuffer.el (ibuffer-mode): Fix synopsis of ibuffer-unmark-backward along with other minor copy-edits. diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 66a7087b9b..8cb9a97d92 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -2523,8 +2523,8 @@ particular subset of them, and sorting by various criteria. Operations on marked buffers: \\ - `\\[ibuffer-do-save]' - Save the marked buffers - `\\[ibuffer-do-view]' - View the marked buffers in this frame. + `\\[ibuffer-do-save]' - Save the marked buffers. + `\\[ibuffer-do-view]' - View the marked buffers in the selected frame. `\\[ibuffer-do-view-other-frame]' - View the marked buffers in another frame. `\\[ibuffer-do-revert]' - Revert the marked buffers. `\\[ibuffer-do-toggle-read-only]' - Toggle read-only state of marked buffers. @@ -2547,7 +2547,7 @@ Operations on marked buffers: buffer's file as an argument. `\\[ibuffer-do-eval]' - Evaluate a form in each of the marked buffers. This is a very flexible command. For example, if you want to make all - of the marked buffers read only, try using (read-only-mode 1) as + of the marked buffers read-only, try using (read-only-mode 1) as the input form. `\\[ibuffer-do-view-and-eval]' - As above, but view each buffer while the form is evaluated. @@ -2562,21 +2562,20 @@ Marking commands: all unmarked buffers. `\\[ibuffer-change-marks]' - Change the mark used on marked buffers. `\\[ibuffer-unmark-forward]' - Unmark the buffer at point. - `\\[ibuffer-unmark-backward]' - Unmark the buffer at point, and move to the - previous line. + `\\[ibuffer-unmark-backward]' - Unmark the previous buffer. `\\[ibuffer-unmark-all]' - Unmark buffers marked with MARK. `\\[ibuffer-unmark-all-marks]' - Unmark all marked buffers. `\\[ibuffer-mark-by-mode]' - Mark buffers by major mode. `\\[ibuffer-mark-unsaved-buffers]' - Mark all \"unsaved\" buffers. This means that the buffer is modified, and has an associated file. `\\[ibuffer-mark-modified-buffers]' - Mark all modified buffers, - regardless of whether or not they have an associated file. + regardless of whether they have an associated file. `\\[ibuffer-mark-special-buffers]' - Mark all buffers whose name begins and ends with `*'. `\\[ibuffer-mark-dissociated-buffers]' - Mark all buffers which have an associated file, but that file doesn't currently exist. `\\[ibuffer-mark-read-only-buffers]' - Mark all read-only buffers. - `\\[ibuffer-mark-dired-buffers]' - Mark buffers in `dired' mode. + `\\[ibuffer-mark-dired-buffers]' - Mark buffers in `dired-mode'. `\\[ibuffer-mark-help-buffers]' - Mark buffers in `help-mode', `apropos-mode', etc. `\\[ibuffer-mark-old-buffers]' - Mark buffers older than `ibuffer-old-time'. `\\[ibuffer-mark-for-delete]' - Mark the buffer at point for deletion. @@ -2655,17 +2654,17 @@ Other commands: ** Information on Filtering: - You can filter your ibuffer view via different criteria. Each Ibuffer +You can filter your Ibuffer view via different criteria. Each Ibuffer buffer has its own stack of active filters. For example, suppose you are working on an Emacs Lisp project. You can create an Ibuffer -buffer displays buffers in just `emacs-lisp' modes via +buffer displaying only `emacs-lisp-mode' buffers via `\\[ibuffer-filter-by-mode] emacs-lisp-mode RET'. In this case, there is just one entry on the filtering stack. You can also combine filters. The various filtering commands push a new filter onto the stack, and the filters combine to show just buffers which satisfy ALL criteria on the stack. For example, suppose -you only want to see buffers in `emacs-lisp' mode, whose names begin +you only want to see buffers in `emacs-lisp-mode', whose names begin with \"gnus\". You can accomplish this via: \\[ibuffer-filter-by-mode] emacs-lisp-mode RET @@ -2709,8 +2708,8 @@ will not be displayed multiple times if they would be included in multiple filter groups; instead, the first filter group is used. The filter groups are displayed in this order of precedence. -You may rearrange filter groups by using the regular -`\\[ibuffer-kill-line]' and `\\[ibuffer-yank]' pair. Yanked groups +You may rearrange filter groups by using the usual pair +`\\[ibuffer-kill-line]' and `\\[ibuffer-yank]'. Yanked groups will be inserted before the group at point." ;; Include state info next to the mode name. (set (make-local-variable 'mode-line-process) commit f77bd2b4ed59370876f5c177398ae3e1683b71f9 Author: Eli Zaretskii Date: Mon May 6 21:52:19 2019 +0300 ; * src/lisp.h (DEFSYM): Fix inaccurate comment. diff --git a/src/lisp.h b/src/lisp.h index 08c6dbdf72..782c396dbb 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2010,7 +2010,7 @@ INLINE int } /* Placeholder for make-docfile to process. The actual symbol - definition is done by lread.c's defsym. */ + definition is done by lread.c's define_symbol. */ #define DEFSYM(sym, name) /* empty */ commit 3b86e0b812e97aa83222f042ce8323516aaca0ec Author: Noam Postavsky Date: Sat May 4 23:55:50 2019 -0400 Clarify handling of long options (Bug#24949) * doc/emacs/cmdargs.texi (Emacs Invocation): Note that space can be used instead of "=" only if an option requires an argument. diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index a905b8f688..9b60c2c3e3 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -39,7 +39,7 @@ corresponding long form. The long forms with @samp{--} are easier to remember, but longer to type. However, you don't have to spell out the whole option name; any -unambiguous abbreviation is enough. When a long option takes an +unambiguous abbreviation is enough. When a long option requires an argument, you can use either a space or an equal sign to separate the option name and the argument. Thus, for the option @samp{--display}, you can write either @samp{--display sugar-bombs:0.0} or commit 04340a8e2f32c12e00000373e0067c570fd2a7cb Author: Eli Zaretskii Date: Sat May 4 12:22:49 2019 +0300 Improve documentation of the daemon and emacsclient * doc/emacs/misc.texi (emacsclient Options): * doc/emacs/cmdargs.texi (Initial Options): Document that using --daemon=NAME will need to specify the same NAME when invoking 'emacscilent'. (Bug#35547) diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index c870e6dad9..a905b8f688 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -347,13 +347,15 @@ Start Emacs with minimum customizations. This is similar to using @itemx --bg-daemon[=@var{name}] @itemx --fg-daemon[=@var{name}] Start Emacs as a daemon: after Emacs starts up, it starts the Emacs -server without opening any frames. -(Optionally, you can specify an explicit @var{name} for the server.) -You can then use the @command{emacsclient} command to connect to Emacs -for editing. @xref{Emacs Server}, for information about using Emacs -as a daemon. A ``background'' daemon disconnects from the terminal -and runs in the background (@samp{--daemon} is an alias for -@samp{--bg-daemon}). +server without opening any frames. You can then use the +@command{emacsclient} command to connect to Emacs for editing. +(Optionally, you can specify an explicit @var{name} for the server; if +you do, you will need to specify the same @var{name} when you invoke +@command{emacsclient}, via its @option{--socket-name} option, see +@ref{emacsclient Options}.) @xref{Emacs Server}, for information +about using Emacs as a daemon. A ``background'' daemon disconnects +from the terminal and runs in the background (@samp{--daemon} is an +alias for @samp{--bg-daemon}). @item --no-desktop @opindex --no-desktop diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 2d1617ef96..fc6b4cf1e7 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1925,6 +1925,9 @@ omitted, @command{emacsclient} connects to the first server it finds. If you set @code{server-name} of the Emacs server to an absolute file name, give the same absolute file name as @var{server-name} to this option to instruct @command{emacsclient} to connect to that server. +You need to use this option if you started Emacs as daemon +(@pxref{Initial Options}) and specified the name for the server +started by the daemon. @item -t @itemx --tty commit 3e29de2ce03d19af84d6dea361e13f0a398e79f1 Author: Noam Postavsky Date: Wed May 1 22:17:10 2019 -0400 * etc/NEWS.24: Belatedly announce delete-consecutive-dups. diff --git a/etc/NEWS.24 b/etc/NEWS.24 index 9150e49fd9..049005306f 100644 --- a/etc/NEWS.24 +++ b/etc/NEWS.24 @@ -1117,6 +1117,8 @@ a non-nil `interactive-only' property. The value, if non-nil, is a regexp that specifies what to trim from the start and end of each substring. +** New function `delete-consecutive-dups'. + ** Completion *** The separator used by `completing-read-multiple' is now a regexp. commit 0ae7b2b88f5356480ba6f2082d76c55ad88dfb55 Author: Glenn Morris Date: Wed May 1 09:20:05 2019 -0700 ; Auto-commit of loaddefs files. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 3903463c8a..405fe362f1 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -1819,7 +1819,7 @@ If `global-auto-revert-non-file-buffers' is non-nil, this mode may also revert some non-file buffers, as described in the documentation of that variable. It ignores buffers with modes matching `global-auto-revert-ignore-modes', and buffers with a -non-nil vale of `global-auto-revert-ignore-buffer'. +non-nil value of `global-auto-revert-ignore-buffer'. When a buffer is reverted, a message is generated. This can be suppressed by setting `auto-revert-verbose' to nil. @@ -18025,8 +18025,9 @@ Return a regular expression matching image-file filenames. (autoload 'insert-image-file "image-file" "\ Insert the image file FILE into the current buffer. -Optional arguments VISIT, BEG, END, and REPLACE are interpreted as for -the command `insert-file-contents'. +Optional arguments VISIT, BEG, END, and REPLACE are interpreted +as for the command `insert-file-contents'. Return list of +absolute file name and number of characters inserted. \(fn FILE &optional VISIT BEG END REPLACE)" nil nil) @@ -36011,7 +36012,12 @@ first backend that could register the file is used. \(fn &optional VC-FILESET COMMENT)" t nil) (autoload 'vc-version-diff "vc" "\ -Report diffs between revisions of the fileset in the repository history. +Report diffs between revisions REV1 and REV2 in the repository history. +This compares two revisions of the current fileset. +If REV1 is nil, it defaults to the current revision, i.e. revision +of the last commit. +If REV2 is nil, it defaults to the work tree, i.e. the current +state of each file in the fileset. \(fn FILES REV1 REV2)" t nil) @@ -36027,8 +36033,14 @@ saving the buffer. \(fn &optional HISTORIC NOT-URGENT)" t nil) (autoload 'vc-version-ediff "vc" "\ -Show differences between revisions of the fileset in the -repository history using ediff. +Show differences between REV1 and REV2 of FILES using ediff. +This compares two revisions of the files in FILES. Currently, +only a single file's revisions can be compared, i.e. FILES can +specify only one file name. +If REV1 is nil, it defaults to the current revision, i.e. revision +of the last commit. +If REV2 is nil, it defaults to the work tree, i.e. the current +state of each file in FILES. \(fn FILES REV1 REV2)" t nil) commit 3e322df06003e64a491bca47fd14f652374ac3a4 Author: Glenn Morris Date: Wed May 1 09:15:59 2019 -0700 * admin/update_autogen: Handle git worktree. ; No need to merge to master. diff --git a/admin/update_autogen b/admin/update_autogen index 67ed5d6646..651d35beaf 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -47,7 +47,7 @@ cd $PD cd ../ [ -d admin ] || die "Could not locate admin directory" -[ -d .git ] || die "No .git directory" +[ -e .git ] || die "No .git" usage () { commit ec02c736d65f2fd3a8a17e4e8dc143bf15d9600d Author: Noam Postavsky Date: Sun Apr 28 08:28:46 2019 -0400 Update process filter example (Bug#35044) * doc/lispref/processes.texi (Filter Functions): Use insert-before-markers in the "ordinary" filter example, like internal-default-process-filter does. diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 7331eb6376..38ad9076a0 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1643,7 +1643,7 @@ how to do these things: (save-excursion ;; @r{Insert the text, advancing the process marker.} (goto-char (process-mark proc)) - (insert string) + (insert-before-markers string) (set-marker (process-mark proc) (point))) (if moving (goto-char (process-mark proc))))))) @end group