emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 520a703: Merge from origin/emacs-28


From: Stefan Kangas
Subject: master 520a703: Merge from origin/emacs-28
Date: Sun, 5 Dec 2021 00:47:53 -0500 (EST)

branch: master
commit 520a703fa7db07ba82661e68cf4eafe7ba61a8d0
Merge: 8bdea76 c086358
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    c086358574 Update to Org 9.5.1-15-gdb4805
    fef3e60061 * lisp/emacs-lisp/edebug.el (edebug-eval-defun): Minor doc...
    a1e30e4106 ; Fix most remaining AUTHORS warnings
    f3e6a432c5 ; * doc/misc/efaq.texi (New in Emacs 28): Add more news.
    00236cc802 Fix the enumeration values returned by 'try_scrolling'
---
 ChangeLog.3               | 16 +++++++--------
 admin/authors.el          | 21 +++++++++++++++++--
 doc/misc/efaq.texi        | 51 +++++++++++++++++++++++++++++++++++++++++++++--
 doc/misc/org.org          |  4 ++--
 etc/AUTHORS               | 34 +++++++++++++++++--------------
 lisp/emacs-lisp/edebug.el |  2 +-
 lisp/org/org-version.el   |  2 +-
 lisp/org/ox-latex.el      |  2 +-
 src/xdisp.c               |  6 +++---
 9 files changed, 103 insertions(+), 35 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index fecad62..b149c82 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -83,7 +83,7 @@
        * lisp/progmodes/gdb-mi.el (gdb-frame-handler): Protect against
        nil fullnames (bug#52196).
 
-2021-11-30  YugaEgo  <yet@ego.team>  (tiny change)
+2021-11-30  Yuga Ego  <yet@ego.team>  (tiny change)
 
        Format and index concept 'predicate' in ELisp Intro
 
@@ -8597,7 +8597,7 @@
 
        * lisp/net/rcirc.el (reconnect): Kill previous process and start a new 
one
 
-2021-09-07  A  <rgm@gnu.org>
+2021-09-07  Glenn Morris  <rgm@gnu.org>
 
        * test/lisp/vc/vc-tests.el (vc-test--version-diff): Git env tweak.
 
@@ -11985,7 +11985,7 @@
 
        Valid quoting in .desktop files
 
-       * etc/emacsclient.desktop, emacsclient-mail.desktop (Exec): Quote
+       * etc/emacsclient.desktop, etc/emacsclient-mail.desktop (Exec): Quote
        according to the rules in the Freedesktop.org Desktop Entry
        Specification.
 
@@ -18217,7 +18217,7 @@
        pulse-reset-face change -- reset back to the start face
        (bug#48936).
 
-2021-06-13  dick  <dick.r.chiang@gmail.com>
+2021-06-13  dickmao  <dick.r.chiang@gmail.com>
 
        Avoid an infinite loop in mml-expand-html-into-multipart-related
 
@@ -58474,9 +58474,9 @@
 
        Dictionary now uses button
 
-       * net/lisp/dictionary-link.el: Removed now obsolete file
-       * net/lisp/dictionary.el: Use insert-button and make-button
-       * net/lisp/dictionary.el (dictionary-mode-map): Now defined using defvar
+       * lisp/net/dictionary-link.el: Removed now obsolete file
+       * lisp/net/dictionary.el: Use insert-button and make-button
+       * lisp/net/dictionary.el (dictionary-mode-map): Now defined using defvar
 
        I had to add a conversion function as parameter for the button 'action
        as I need to be able to pass nil data to my function. This is not
@@ -69091,7 +69091,7 @@
        (macfont_glyph_extents): Fix monospace glyph computation.
        (macfont_shape): Ditto.
 
-2020-08-12  Mingde (Matthew) Zeng  <matthewzmd@gmail.com>
+2020-08-12  Mingde Matthew Zeng  <matthewzmd@gmail.com>
 
        Fix erc-reuse-buffers behavior
 
diff --git a/admin/authors.el b/admin/authors.el
index 11fbfc8..d44bb9b 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -398,8 +398,12 @@ Changes to files matching one of the regexps in this list 
are not listed.")
     "images/icons/allout-widgets-light-bg"
     "lisp/shorthand.el"
     "test/lisp/shorthand-tests.el"
+    "lisp/shorthands.el"
+    "test/src/comp-test-funcs.el"
     "lisp/net/link.el"
     "lisp/net/connection.el"
+    "lisp/net/dictionary-link.el"
+    "test/src/comp-test-funcs-dyn.el"
     ;; Never had any meaningful changes logged, now deleted:
     "lib/stdarg.in.h" "lib/stdbool.in.h"
     "unidata/bidimirror.awk" "unidata/biditype.awk"
@@ -537,6 +541,8 @@ Changes to files matching one of the regexps in this list 
are not listed.")
     "lisp/org/ob-abc.el"
     "lisp/org/ob-ebnf.el"
     "lisp/org/ob-J.el"
+    ;; Removed -- for now.
+    "test/src/doc-tests.el"
     )
   "List of files and directories to ignore.
 Changes to files in this list are not listed.")
@@ -999,6 +1005,7 @@ in the repository.")
     ("DIFF" . "OTHER.EMACSES")
     ("CCADIFF" . "OTHER.EMACSES")
     ("GOSDIFF" . "OTHER.EMACSES")
+    ("emacs.appdata.xml" . "emacs.metainfo.xml")
     ;; Nextstep
     ("nextstep/Cocoa/Emacs.base/Contents/Info.plist" . 
"nextstep/templates/Info.plist.in")
     ;; Moved from lisp/tpu-doc.el to etc/tpu-edt.doc in Emacs 19.29.
@@ -1053,6 +1060,12 @@ in the repository.")
     ("lisp/gnus/messcompat.el" . "messcompat.el")
     ("html2text.el" . "html2text.el")
     ("lisp/net/html2text.el" . "html2text.el")
+    ;; Obsolete in 28.1.
+    ("inversion.el" . "inversion.el")
+    ("test/lisp/cedet/inversion-tests.el" . "inversion-tests.el")
+    ("test/lisp/mail/rfc2368-tests.el" . "rfc2368-tests.el")
+    ;; This file was briefly obsolete:
+    ("lisp/obsolete/erc-compat.el" . "erc-compat.el")
     ;; From lisp to etc/forms.
     ("forms-d2.el" . "forms-d2.el")
     ("forms-pass.el" . "forms-pass.el")
@@ -1195,8 +1208,12 @@ in the repository.")
     ("lisp/gnus/nnir.el" . "nnir.el")
     ("src/regex.c" . "emacs-regex.c")
     ("src/regex.h" . "emacs-regex.h")
-    ("erc-compat.el" . "erc-compat.el")
-    ("semantic-utest-fmt.el" . "format-tests.el")
+    ("test/manual/rmailmm.el" . "rmailmm-tests.el")
+    ("test/lisp/cedet/semantic-utest-fmt.el" . "format-tests.el")
+    ("test/lisp/emacs-lisp/tabulated-list-test.el" . "tabulated-list-tests.el")
+    ("test/lisp/url/url-handlers-test.el" . "url-handlers-tests.el")
+    ("test/src/dired-tests.el" . "dired-tests.el")
+    (".dir-locals.el" . ".dir-locals.el")
     )
   "Alist of files which have been renamed during their lifetime.
 Elements are (OLDNAME . NEWNAME).")
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 923687e..28f0cb9 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -934,7 +934,7 @@ file (@kbd{C-h n}) for the full list of changes in Emacs 28.
 @item
 Emacs now optionally supports native compilation of Lisp files.  This
 can improves performance significantly in some cases.  To enable this,
-configure Emacs with the '--with-native-compilation' option.
+configure Emacs with the @option{--with-native-compilation} option.
 
 @item
 The new NonGNU ELPA archive is enabled by default alongside GNU ELPA.
@@ -945,6 +945,13 @@ by the @code{list-packages} command.
 The Cairo graphics library is now used by default if present.
 
 @item
+On GNU/Linux, Emacs now supports loading Secure Computing filters.  To
+use this feature, invoke Emacs with the @option{--seccomp=@var{file}}
+command-line switch, where @var{file} names a binary file that defines
+the filtering.  See the manual page of the @code{seccomp} system call
+for more details.
+
+@item
 The new themes @samp{modus-vivendi} and @samp{modus-operandi} have
 been added.  They are designed to conform with the highest standard
 for color-contrast accessibility (WCAG AAA).
@@ -958,9 +965,49 @@ New system for displaying documentation for groups of 
functions
 (@kbd{M-x shortdoc-display-group RET}).
 
 @item
+Emacs can now support 24-bit color text-mode terminals even if their
+terminfo database doesn't state this support in a standard way.  Set
+the @env{COLORTERM} environment variable to the value @samp{truecolor}
+to activate this.
+
+@item
+The @code{strike-through} face attribute is now supported on capable
+text-mode terminals.
+
+@item
+@code{xterm-mouse-mode} supports TTY menus.
+
+@item
+A new minor mode @code{context-menu-mode} causes @code{mouse-3}
+(a.k.a.@: ``right-clicks'') of the mouse to pop up context-dependent
+menus.
+
+@item
+Prefix commands to control the display of the results of the next
+command.  @kbd{C-x 4 4 @var{command}} displays the result of
+@var{command} in a new window.  @kbd{C-x 5 5 @var{command}} displays
+the results of @var{command} in a new frame.
+
+@item
+Emacs now supports ``transient'' input methods.  A transient input
+method is enabled for inserting a single character, and is then
+automatically disabled.  Select a transient input method with @kbd{C-u
+C-x \}; enable it (for inserting a single character) with @kbd{C-x \}.
+New input methods @code{compose} (based on X Window System Multi_key
+sequences) and @code{iso-transl} are especially convenient with this
+feature, when you need to insert a single special character.
+
+@item
+@kbd{M-y}, when invoked after a command that is not a yank command,
+allows selection of one of the previous kills.
+
+@item
+New minor mode @code{repeat-mode} allows to repeat commands with fewer
+keystrokes.
+
+@item
 Among the many internal changes in this release, we would like to
 highlight that all files in the tree now use @code{lexical-binding}.
-
 @end itemize
 
 
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 8511771..adf24da 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -15571,7 +15571,7 @@ for usage and configuration details.
 :DESCRIPTION: Fine-tuning the export output.
 :END:
 
-*** Hooks
+*** Export hooks
 :PROPERTIES:
 :UNNUMBERED: notoc
 :END:
@@ -18203,7 +18203,7 @@ expanded anyway.
   #+kindex: C-c C-v f
   Choose a file to tangle.  Bound to {{{kbd(C-c C-v f)}}}.
 
-*** Hooks
+*** Tangle hooks
 :PROPERTIES:
 :UNNUMBERED: notoc
 :END:
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 3e70cc6..60b1ee4 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -257,8 +257,8 @@ Alyssa Ross: changed progmodes/compile.el simple.el
 Ami Fischman: changed bindings.el calendar.el diary-lib.el print.c
   savehist.el vc-git.el
 
-Amin Bandali: changed erc.el erc-backend.el erc-button.el erc-track.el
-  erc-compat.el erc-dcc.el erc-desktop-notifications.el erc-match.el
+Amin Bandali: changed erc.el erc-backend.el erc-button.el erc-compat.el
+  erc-track.el erc-dcc.el erc-desktop-notifications.el erc-match.el
   erc-services.el erc-speedbar.el erc-status-sidebar.el erc.texi
   erc-autoaway.el erc-fill.el erc-goodies.el erc-ibuffer.el erc-imenu.el
   erc-join.el erc-lang.el erc-list.el erc-log.el and 11 other files
@@ -473,8 +473,8 @@ Artem Chuprina: changed message.el
 Artem Loenko: changed src/Makefile.in
 
 Arthur Miller: changed help-fns.el ange-ftp.el bytecomp.el comp.c comp.el
-  dired.c dired.el files.texi help.texi lisp.h ls-lisp.el sysdep.c
-  tramp-adb.el tramp-rclone.el tramp-sh.el tramp-smb.el tramp.el
+  dired-tests.el dired.c dired.el files.texi help.texi lisp.h ls-lisp.el
+  sysdep.c tramp-adb.el tramp-rclone.el tramp-sh.el tramp-smb.el tramp.el
   wdired.el
 
 Artur Malabarba: wrote char-fold-tests.el faces-tests.el isearch-tests.el
@@ -1422,8 +1422,8 @@ Diane Murray: changed erc.el erc-backend.el erc-menu.el 
erc-button.el
 Dick R. Chiang: changed ffap-tests.el ffap.el gnus-group.el gnus.texi
   message.el bindings.el buffer-tests.el buffer.c checkdoc.el
   cl-macs-tests.el cl-macs.el comint-tests.el gnus-srvr.el gnus-sum.el
-  gnus-topic.el gnutls.c key.pub key.sec minibuffer.el misc.texi
-  package.el and 6 other files
+  gnus-topic.el gnutls.c key.pub key.sec minibuffer.el misc.texi mml.el
+  and 7 other files
 
 Didier Verna: wrote gnus-diary.el nndiary.el
 and co-wrote nnml.el
@@ -2004,7 +2004,7 @@ and changed configure.ac Makefile.in src/Makefile.in 
calendar.el
   lisp/Makefile.in diary-lib.el files.el make-dist rmail.el
   progmodes/f90.el bytecomp.el admin.el misc/Makefile.in simple.el
   authors.el startup.el emacs.texi lib-src/Makefile.in display.texi
-  ack.texi subr.el and 1789 other files
+  ack.texi subr.el and 1790 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -2899,7 +2899,7 @@ and co-wrote help-tests.el keymap-tests.el
 and changed subr.el desktop.el w32fns.c faces.el simple.el emacsclient.c
   files.el server.el bs.el help-fns.el xdisp.c org.el w32term.c w32.c
   buffer.c keyboard.c ido.el image.c window.c eval.c allout.el
-  and 1224 other files
+  and 1226 other files
 
 Juan Pechiar: changed ob-octave.el
 
@@ -3303,7 +3303,7 @@ and co-wrote gnus-kill.el gnus-mh.el gnus-msg.el 
gnus-score.el
 and changed gnus.texi simple.el subr.el files.el process.c text.texi
   display.texi dired.el gnutls.c gnus-ems.el smtpmail.el help-fns.el
   auth-source.el url-http.el edebug.el gnus-cite.el image.el pop3.el
-  dired-aux.el fns.c image.c and 859 other files
+  dired-aux.el fns.c image.c and 860 other files
 
 Lars Rasmusson: changed ebrowse.c
 
@@ -3977,6 +3977,8 @@ and changed comint.el faces.el simple.el editfns.c 
xfaces.c xdisp.c
 
 Milton Wulei: changed gdb-ui.el
 
+Mingde Matthew Zeng: changed erc-join.el erc.el
+
 Mirek Kaim: changed configure.ac
 
 Mirko Vukovic: changed emacs.texi maintaining.texi
@@ -4130,7 +4132,7 @@ and changed README authors.el configure.ac sed2v2.inp 
sequences.texi
   README.W32 emacs.png HISTORY emacs23.png arc-mode.el cl-extra.el
   emacs.svg manoj-dark-theme.el Emacs.icns Makefile.in auth-source.el
   emacs.ico fns.c make-tarball.txt obarray-tests.el obarray.el
-  and 36 other files
+  and 37 other files
 
 Nicolas Richard: wrote cl-seq-tests.el cmds-tests.el replace-tests.el
 and changed ffap.el package.el byte-run.el help.el keyboard.c landmark.el
@@ -4422,8 +4424,8 @@ Peter M√ľnster: changed image-dired.el gnus-delay.el 
gnus-demon.el
 
 Peter O'Gorman: changed configure.ac frame.h hpux10-20.h termhooks.h
 
-Peter Oliver: changed emacsclient.desktop Makefile.in emacs-mail.desktop
-  emacsclient-mail.desktop server.el configure.ac emacs.desktop
+Peter Oliver: changed emacsclient.desktop emacsclient-mail.desktop
+  Makefile.in emacs-mail.desktop server.el configure.ac emacs.desktop
   emacs.metainfo.xml misc.texi perl-mode.el ruby-mode-tests.el vc-sccs.el
 
 Peter Povinec: changed term.el
@@ -4746,7 +4748,7 @@ Robert Cochran: changed tab-bar.el bytecomp.el 
checkdoc.el data.c
 
 Robert Fenk: changed desktop.el
 
-Robert Jarzmik: changed ede/linux.el
+Robert Jarzmik: changed ede/linux.el inversion.el
 
 Robert J. Chassell: wrote makeinfo.el page-ext.el texinfo.el
   texnfo-upd.el
@@ -5162,7 +5164,7 @@ and changed efaq.texi checkdoc.el package.el 
cperl-mode.el bookmark.el
   help.el keymap.c subr.el simple.el erc.el ediff-util.el idlwave.el
   time.el bytecomp-tests.el comp.el speedbar.el bytecomp.el
   emacs-lisp-intro.texi flyspell.el ibuffer.el package-tests.el
-  and 1333 other files
+  and 1337 other files
 
 Stefan Merten: co-wrote rst.el
 
@@ -5179,7 +5181,7 @@ and co-wrote font-lock.el gitmerge.el pcvs.el
 and changed subr.el simple.el keyboard.c bytecomp.el cl-macs.el files.el
   lisp.h vc.el xdisp.c alloc.c eval.c sh-script.el progmodes/compile.el
   keymap.c buffer.c window.c tex-mode.el lisp-mode.el newcomment.el
-  help-fns.el lread.c and 1615 other files
+  help-fns.el lread.c and 1616 other files
 
 Stefano Facchini: changed gtkutil.c
 
@@ -5984,6 +5986,8 @@ Yuchen Pei: changed calendar.texi diary-lib.el 
icalendar-tests.el
 
 Yue Daian: wrote cl-font-lock.el
 
+Yuga Ego: changed emacs-lisp-intro.texi
+
 Yu-ji Hosokawa: changed README.W32
 
 Yukihiro Matsumoto: co-wrote ruby-mode.el
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index a38c8bd..ac1cd22 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -469,7 +469,7 @@ just FUNCTION is printed."
     (funcall orig-fun nil)))
 
 (defun edebug-eval-defun (edebug-it)
-  (declare (obsolete "use eval-defun or edebug--eval-defun instead" "28.1"))
+  (declare (obsolete "use `eval-defun' or `edebug--eval-defun' instead" 
"28.1"))
   (interactive "P")
   (if (advice-member-p #'edebug--eval-defun 'eval-defun)
       (eval-defun edebug-it)
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 212069e..de75519 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.5.1-11-g96d91b"))
+   (let ((org-git-version "release_9.5.1-15-gdb4805"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 3e39670..c45dc98 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -3706,7 +3706,7 @@ Return PDF file's name."
   (let ((outfile (org-export-output-file-name ".tex" subtreep)))
     (org-export-to-file 'latex outfile
       async subtreep visible-only body-only ext-plist
-      (lambda (file) (org-latex-compile file)))))
+      #'org-latex-compile)))
 
 (defun org-latex-compile (texfile &optional snippet)
   "Compile a TeX file.
diff --git a/src/xdisp.c b/src/xdisp.c
index 7ca3977..b2eeb11 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17706,9 +17706,9 @@ cursor_row_fully_visible_p (struct window *w, bool 
force_p,
 
 enum
 {
-  SCROLLING_SUCCESS,
-  SCROLLING_FAILED,
-  SCROLLING_NEED_LARGER_MATRICES
+  SCROLLING_SUCCESS = 1,
+  SCROLLING_FAILED = 0,
+  SCROLLING_NEED_LARGER_MATRICES = -1
 };
 
 /* If scroll-conservatively is more than this, never recenter.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]