mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-10 16:20:17 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-26

Browse source 
ff9c962 ; * lisp/ldefs-boot.el: Update.
b4a251c * ; ChangeLog.3 update
d3104e3 * etc/AUTHORS: Update.
a19bfb7 Remove .art from the default list of ImageMagick extensions
6985caa Fix input after setting x-wait-for-event-timeout nil
715388a Fix two warnings in eshell.texi
d49cdd9 * lisp/minibuffer.el (completion-table-dynamic): Improve docs...
5dc4e51 * lisp/emacs-lisp/debug.el (debug-on-variable-change): Doc fi...
76ef805 Fix a typo in ELisp manual
b5e66f4 Update citations of Internet RFCs
57ece2a Fix handling of manpage references divided by hyphenation
7ad0cd6 * doc/misc/eshell.texi: Fix some @ref's.
12b7940 Fix a typo in lispref/syntax.texi

# Conflicts:
#	lisp/gnus/nnrss.el
#	lisp/mail/ietf-drums.el
This commit is contained in:
Glenn Morris 2019-02-20 12:07:22 -08:00
commit 83a9133e35
43 changed files with 749 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/emacs-lisp/debug.el
View file

@ -744,7 +744,7 @@ This function is called when SYMBOL's value is modified."
When called interactively, prompt for VARIABLE in the minibuffer.
This works by calling `add-variable-watch' on VARIABLE. If you
This works by calling `add-variable-watcher' on VARIABLE. If you
quit from the debugger, this will abort the change (unless the
change is caused by the termination of a let-binding).