Commit 6bdb561a authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-27

a2b07f9f (origin/emacs-27) ; * etc/NEWS: Explain how to get back ol...
b468b3d1 Fix a recent documentation change
1ab766fd Fix last change
ecfe6339 * lisp/tab-bar.el: Last-minute changes.
c1ce9fa7 * lisp/subr.el (cancel-change-group): Fix bug#39680
ef5744a9 Improve docs for horizontal scrolling with mouse and touch...
1bc3fa0b * lisp/emacs-lisp/package.el (package-install): Fix typo i...
4537976a Port .gdbinit to clang with -gdwarf-4
0883c800 Simplify rx example in manual
a6951892 ; * etc/NEWS: Fix typo.

# Conflicts:
#	etc/NEWS
parents 099520ec a2b07f9f
Pipeline #5019 passed with stage
in 54 minutes and 2 seconds
......@@ -217,10 +217,15 @@ default bound to scrolling with the @key{Ctrl} modifier.
@vindex mouse-wheel-tilt-scroll
@vindex mouse-wheel-flip-direction
Emacs can also support horizontal scrolling if your mouse's wheel can
be tilted. This feature is off by default; the variable
@code{mouse-wheel-tilt-scroll} turns it on. If you'd like to reverse
the direction of horizontal scrolling, customize the variable
@code{mouse-wheel-flip-direction} to a non-@code{nil} value.
be tilted, or if your touchpad supports it. This feature is off by
default; the variable @code{mouse-wheel-tilt-scroll} turns it on, if
you customize it to a non-@code{nil} value. By default, tilting the
mouse wheel scrolls the window's view horizontally in the direction of
the tilt: e.g., tilting to the right scrolls the window to the right,
so that the text displayed in the window moves horizontally to the
left. If you'd like to reverse the direction of horizontal scrolling,
customize the variable @code{mouse-wheel-flip-direction} to a
non-@code{nil} value.
When the mouse pointer is over an image, scrolling the mouse wheel
with the @key{Ctrl} modifier scales the image under the mouse pointer.
......@@ -1021,8 +1021,8 @@ or, using shorter synonyms and written more compactly,
(rx "/*"
(* (| (not (any "*"))
(: "*" (not (any "/")))))
(* (| (not "*")
(: "*" (not "/"))))
(+ "*") "/")
@end group
@end example
......@@ -360,6 +360,14 @@ its '--eval' command-line option), as well as in
'lisp-interaction-mode' and 'ielm-mode', used in the "*scratch*" and
"*ielm*" buffers.
We envision that most Lisp code is already either written with
lexical-binding in mind, or will work unchanged under
lexical-binding. If, for some reason, your code used in 'M-:' or
'--eval' doesn't work as result of this change, either modify the code
to work with lexical binding, or wrap it in an extra level of 'eval'.
For example, --eval FORM becomes --eval "(eval 'FORM)" (note the extra
quote in 'FORM).
** The new user option 'tooltip-resize-echo-area' avoids truncating
tooltip text on GUI frames when tooltips are displayed in the echo
......@@ -779,7 +787,7 @@ an offset to absolute line numbers.
** table
*** 'table-generate-source' now supports wiki and mediawiki
*** 'table-generate-source' now supports wiki and mediawiki.
This command can now output wiki and mediawiki format tables.
** telnet-mode
......@@ -2045,7 +2045,7 @@ Mark the installed package as selected by adding it to
When called from Lisp and optional argument DONT-SELECT is
non-nil, install the package but do not add it to
If PKG is a `package-desc' and it is already installed, don't try
to install it but still mark it as selected."
......@@ -145,13 +145,19 @@ face height."
;;; For tilt-scroll
(defcustom mouse-wheel-tilt-scroll nil
"Enable scroll using tilting mouse wheel."
"Enable horizontal scrolling by tilting mouse wheel or via touchpad.
Also see `mouse-wheel-flip-direction'."
:group 'mouse
:type 'boolean
:version "26.1")
(defcustom mouse-wheel-flip-direction nil
"Swap direction of `wheel-right' and `wheel-left'."
"Swap direction of `wheel-right' and `wheel-left'.
By default, `wheel-right' scrolls the text to the right,
and `wheel-left' scrolls in the other direction.
If this variable is non-nil, it inverts the direction of
horizontal scrolling by tilting the mouse wheel.
Also see `mouse-wheel-tilt-scroll'."
:group 'mouse
:type 'boolean
:version "26.1")
......@@ -2987,13 +2987,18 @@ This finishes the change group by reverting all of its changes."
;; the body of `atomic-change-group' all changes can be undone.
(let ((old-car (car-safe elt))
(old-cdr (cdr-safe elt)))
(old-cdr (cdr-safe elt))
;; Use `pending-undo-list' temporarily since `undo-more' needs
;; it, but restore it afterwards so as not to mess with an
;; ongoing sequence of `undo's.
;; Use `buffer-undo-list' unconditionally (bug#39680).
;; Temporarily truncate the undo log at ELT.
(when (consp elt)
(setcar elt nil) (setcdr elt nil))
(unless (eq last-command 'undo) (undo-start))
;; Make sure there's no confusion.
(when (and (consp elt) (not (eq elt (last pending-undo-list))))
(error "Undoing to some unrelated state"))
......@@ -123,7 +123,8 @@ Possible modifiers are `control', `meta', `shift', `hyper', `super' and
(assq-delete-all 'tab-bar-lines
(when (and tab-bar-mode (not (get-text-property 0 'display tab-bar-new-button)))
(when (and tab-bar-mode tab-bar-new-button
(not (get-text-property 0 'display tab-bar-new-button)))
;; This file is pre-loaded so only here we can use the right data-directory:
(add-text-properties 0 (length tab-bar-new-button)
`(display (image :type xpm
......@@ -132,7 +133,8 @@ Possible modifiers are `control', `meta', `shift', `hyper', `super' and
:ascent center))
(when (and tab-bar-mode (not (get-text-property 0 'display tab-bar-close-button)))
(when (and tab-bar-mode tab-bar-close-button
(not (get-text-property 0 'display tab-bar-close-button)))
;; This file is pre-loaded so only here we can use the right data-directory:
(add-text-properties 0 (length tab-bar-close-button)
`(display (image :type xpm
......@@ -263,6 +265,17 @@ before calling the command that adds a new tab."
:group 'tab-bar
:version "27.1")
(defcustom tab-bar-new-button-show t
"If non-nil, show the \"New tab\" button in the tab bar.
When this is nil, you can create new tabs with \\[tab-new]."
:type 'boolean
:initialize 'custom-initialize-default
:set (lambda (sym val)
(set-default sym val)
:group 'tab-bar
:version "27.1")
(defvar tab-bar-new-button " + "
"Button for creating a new tab.")
......@@ -306,7 +319,8 @@ This helps to select the tab by its number using `tab-bar-select-tab'."
:group 'tab-bar
:version "27.1")
(defvar tab-bar-separator nil)
(defvar tab-bar-separator nil
"String that delimits tabs.")
(defcustom tab-bar-tab-name-function #'tab-bar-tab-name-current
......@@ -464,9 +478,9 @@ Return its existing value or a new value."
(tab-bar-close-tab ,i)))))))
(when tab-bar-new-button
`((sep-add-tab menu-item ,separator ignore)
(add-tab menu-item ,tab-bar-new-button tab-bar-new-tab
`((sep-add-tab menu-item ,separator ignore))
(when (and tab-bar-new-button-show tab-bar-new-button)
`((add-tab menu-item ,tab-bar-new-button tab-bar-new-tab
:help "New tab"))))))
......@@ -72,7 +72,7 @@ end
define xgetsym
xgetptr $arg0
set $ptr = ((struct Lisp_Symbol *) ((char *)lispsym + $ptr))
set $ptr = ((struct Lisp_Symbol *) ((char *) &lispsym + $ptr))
# Access the name of a symbol
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment