commit 69398a4da0076f8b2b3045dbd80d63b7d694596e (HEAD, refs/remotes/origin/master) Author: Dmitry Gutov Date: Thu Jul 29 04:57:05 2021 +0300 Fix printing of multiple items in one group without line numbers * lisp/progmodes/xref.el (xref--insert-xrefs): Fix printing of multiple items in one group without line numbers (mentioned in bug#49731). diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index e2cd904a6c..7453dbed99 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -966,7 +966,8 @@ GROUP is a string for decoration purposes and XREF is an 'face 'xref-line-number))))) ;; Render multiple matches on the same line, together. (when (and (equal prev-group group) - (not (equal prev-line line))) + (or (null line) + (not (equal prev-line line)))) (insert "\n")) (xref--insert-propertized (list 'xref-item xref commit d6a3b1cd2b175d77bcfb24ac6ae047eb18b1bfcb Author: dickmao Date: Wed Jul 28 20:52:51 2021 +0200 Rename Gnus -unsubscribe-group commands to -toggle-subscription * doc/emacs/misc.texi (Gnus Group Buffer): Document change. * doc/misc/gnus.texi (Subscription Commands): Document change. (Browse Foreign Server): Document change. * lisp/gnus/gnus-group.el (gnus-group-mode-map): Unsubscribe is not subscribe. (gnus-group-sub-map): Unsubscribe is not subscribe. (gnus-group-make-menu-bar): Unsubscribe is not subscribe. (gnus-group-tool-bar-gnome): Unsubscribe is not subscribe. (gnus-group-mode): Unsubscribe is not subscribe. (gnus-group-unsubscribe): Refactor. (gnus-group-subscribe): Refactor. (gnus-group-unsubscribe-current-group): Define obsolete alias. (gnus-group-unsubscribe-group): Define obsolete alias. (gnus-group-toggle-subscription-at-point): Refactor. (gnus-group-set-subscription-at-point): Refactor. (gnus-group-toggle-subscription): Refactor. (gnus-group-set-subscription): Refactor. * lisp/gnus/gnus-srvr.el (gnus-browse-mode-map): Unsubscribe is not subscribe. (gnus-browse-make-menu-bar): Unsubscribe is not subscribe. (gnus-browse-mode): Document the change. (gnus-browse-unsubscribe-current-group): Define obsolete alias. (gnus-browse-unsubscribe-group): Define obsolete alias. (gnus-browse-toggle-subscription-at-point): Unsubscribe is not subscribe. (gnus-browse-toggle-subscription): Unsubscribe is not subscribe (bug#49759). diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index aba98cf21e..8bf1032633 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -163,14 +163,13 @@ List killed groups (@code{gnus-group-list-killed}). List zombie groups (@code{gnus-group-list-zombies}). @kindex u @r{(Gnus Group mode)} -@findex gnus-group-unsubscribe-current-group +@findex gnus-group-toggle-subscription @cindex subscribe groups @cindex unsubscribe groups @item u Toggle the subscription status of the group -(@code{gnus-group-unsubscribe-current-group}) on the current line -(i.e., turn a subscribed group into an unsubscribed group, or vice -versa). Invoking this on a killed or zombie group turns it into an +(@code{gnus-group-toggle-subscription}) on the current line. +Invoking this on a killed or zombie group turns it into an unsubscribed group. @kindex C-k @r{(Gnus Group mode)} diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 9cdcf39ae1..6dca5b6955 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -2318,19 +2318,18 @@ commands listed in @ref{Browse Foreign Server} at hand. @itemx u @kindex S t @r{(Group)} @kindex u @r{(Group)} -@findex gnus-group-unsubscribe-current-group -@c @icon{gnus-group-unsubscribe} -Toggle subscription to the current group -(@code{gnus-group-unsubscribe-current-group}). +@findex gnus-group-toggle-subscription +@c @icon{gnus-group-toggle-subscription} +Toggle subscription to group under point +(@code{gnus-group-toggle-subscription}). @item S s @itemx U @kindex S s @r{(Group)} @kindex U @r{(Group)} -@findex gnus-group-unsubscribe-group -Prompt for a group to subscribe, and then subscribe it. If it was -subscribed already, unsubscribe it instead -(@code{gnus-group-unsubscribe-group}). +@findex gnus-group-toggle-subscription +Prompt for group, and toggle its subscription. +(@code{gnus-group-toggle-subscription}). @item S k @itemx C-k @@ -3736,10 +3735,10 @@ Enter the current group (@code{gnus-browse-select-group}). @item u @kindex u @r{(Browse)} -@findex gnus-browse-unsubscribe-current-group +@findex gnus-browse-toggle-subscription @vindex gnus-browse-subscribe-newsgroup-method -Unsubscribe to the current group, or, as will be the case here, -subscribe to it (@code{gnus-browse-unsubscribe-current-group}). You +Toggle subscription of the current group +(@code{gnus-browse-toggle-subscription}). You can affect the way the new group is entered into the Group buffer using the variable @code{gnus-browse-subscribe-newsgroup-method}. See @pxref{Subscription Methods} for available options. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index c8b95d9185..ec18b3f464 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -589,8 +589,8 @@ simple manner." "\M-p" gnus-group-prev-unread-group-same-level "," gnus-group-best-unread-group "." gnus-group-first-unread-group - "u" gnus-group-unsubscribe-current-group - "U" gnus-group-unsubscribe-group + "u" gnus-group-toggle-subscription-at-point + "U" gnus-group-toggle-subscription "c" gnus-group-catchup-current "C" gnus-group-catchup-current-all "\M-c" gnus-group-clear-data @@ -767,8 +767,8 @@ simple manner." (gnus-define-keys (gnus-group-sub-map "S" gnus-group-mode-map) "l" gnus-group-set-current-level - "t" gnus-group-unsubscribe-current-group - "s" gnus-group-unsubscribe-group + "t" gnus-group-toggle-subscription-at-point + "s" gnus-group-toggle-subscription "k" gnus-group-kill-group "y" gnus-group-yank-group "w" gnus-group-kill-region @@ -814,7 +814,7 @@ simple manner." ["Check for new articles " gnus-topic-get-new-news-this-topic :included (gnus-topic-mode-p) :help "Check for new messages in current group or topic"] - ["Toggle subscription" gnus-group-unsubscribe-current-group + ["Toggle subscription" gnus-group-toggle-subscription-at-point (gnus-group-group-name)] ["Kill" gnus-group-kill-group :active (gnus-group-group-name) :help "Kill (remove) current group"] @@ -907,7 +907,7 @@ simple manner." ["Execute command" gnus-group-universal-argument (or gnus-group-marked (gnus-group-group-name))]) ("Subscribe" - ["Subscribe to a group..." gnus-group-unsubscribe-group t] + ["Toggle subscription..." gnus-group-toggle-subscription t] ["Kill all newsgroups in region" gnus-group-kill-region :active mark-active] ["Kill all zombie groups" gnus-group-kill-all-zombies @@ -1042,7 +1042,7 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and ;; (gnus-group-find-new-groups "???" nil) (gnus-group-save-newsrc "save") (gnus-group-describe-group "describe") - (gnus-group-unsubscribe-current-group "gnus/toggle-subscription") + (gnus-group-toggle-subscription-at-point "gnus/toggle-subscription") (gnus-group-prev-unread-group "left-arrow") (gnus-group-next-unread-group "right-arrow") (gnus-group-exit "exit") @@ -1119,7 +1119,7 @@ The group buffer lists (some of) the groups available. For instance, lists all zombie groups. Groups that are displayed can be entered with `\\[gnus-group-read-group]'. To subscribe -to a group not displayed, type `\\[gnus-group-unsubscribe-group]'. +to a group not displayed, type `\\[gnus-group-toggle-subscription]'. For more in-depth information on this mode, read the manual (`\\[gnus-info-find-node]'). @@ -3857,61 +3857,79 @@ Uses the process/prefix convention." (defun gnus-group-unsubscribe (&optional n) "Unsubscribe the current group." (interactive "P" gnus-group-mode) - (gnus-group-unsubscribe-current-group n 'unsubscribe)) + (gnus-group-set-subscription-at-point n 'unsubscribe)) (defun gnus-group-subscribe (&optional n) "Subscribe the current group." (interactive "P" gnus-group-mode) - (gnus-group-unsubscribe-current-group n 'subscribe)) + (gnus-group-set-subscription-at-point n 'subscribe)) -(defun gnus-group-unsubscribe-current-group (&optional n do-sub) +(define-obsolete-function-alias 'gnus-group-unsubscribe-current-group + 'gnus-group-toggle-subscription-at-point "28.1") +(define-obsolete-function-alias 'gnus-group-unsubscribe-group + 'gnus-group-toggle-subscription "28.1") + +(defun gnus-group-toggle-subscription-at-point (&optional n) "Toggle subscription of the current group. If given numerical prefix, toggle the N next groups." (interactive "P" gnus-group-mode) + (gnus-group-set-subscription-at-point n 'toggle)) + +(defun gnus-group-set-subscription-at-point (n do-sub) + "Set subscription of the current group for next N groups." (dolist (group (gnus-group-process-prefix n)) (gnus-group-remove-mark group) - (gnus-group-unsubscribe-group + (gnus-group-set-subscription group - (cond - ((eq do-sub 'unsubscribe) - gnus-level-default-unsubscribed) - ((eq do-sub 'subscribe) - gnus-level-default-subscribed) - ((<= (gnus-group-group-level) gnus-level-subscribed) - gnus-level-default-unsubscribed) - (t - gnus-level-default-subscribed)) + (cl-case do-sub + (unsubscribe gnus-level-default-unsubscribed) + (subscribe gnus-level-default-subscribed) + (toggle (if (<= (gnus-group-group-level) gnus-level-subscribed) + gnus-level-default-unsubscribed + gnus-level-default-subscribed)) + (t (error "Unknown subscription setting %s" do-sub))) t) (gnus-group-update-group-line)) (gnus-group-next-group 1)) -(defun gnus-group-unsubscribe-group (group &optional level silent) - "Toggle subscription to GROUP. -Killed newsgroups are subscribed. If SILENT, don't try to update the -group line." +(defun gnus-group-toggle-subscription (group &optional silent) (interactive (list (gnus-group-completing-read nil nil (gnus-read-active-file-p))) gnus-group-mode) + (let* ((newsrc (gnus-group-entry group)) + (level (cond + (newsrc + ;; Toggle subscription flag. + (if (<= (gnus-info-level (nth 1 newsrc)) + gnus-level-subscribed) + (1+ gnus-level-subscribed) + gnus-level-default-subscribed)) + ((and (stringp group) + (or (not (gnus-read-active-file-p)) + (gnus-active group))) + ;; Add new newsgroup. + gnus-level-default-subscribed) + (t 'unsubscribe)))) + (gnus-group-set-subscription group level silent))) + +(defun gnus-group-set-subscription (group level &optional silent) + "Set subscription of GROUP to LEVEL. +Killed newsgroups are subscribed. If SILENT, don't try to update the +group line." (let ((newsrc (gnus-group-entry group))) (cond ((string-match "\\`[ \t]*\\'" group) (error "Empty group name")) (newsrc - ;; Toggle subscription flag. - (gnus-group-change-level - newsrc (or level (if (<= (gnus-info-level (nth 1 newsrc)) - gnus-level-subscribed) - (1+ gnus-level-subscribed) - gnus-level-default-subscribed))) + (gnus-group-change-level newsrc level) (unless silent (gnus-group-update-group group))) ((and (stringp group) (or (not (gnus-read-active-file-p)) (gnus-active group))) - ;; Add new newsgroup. (gnus-group-change-level group - (or level gnus-level-default-subscribed) + level (or (and (member group gnus-zombie-list) gnus-level-zombie) gnus-level-killed) diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index f66f8427ea..b316a2e86f 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -716,7 +716,7 @@ claim them." "\M-n" gnus-browse-next-group "\M-p" gnus-browse-prev-group "\r" gnus-browse-select-group - "u" gnus-browse-unsubscribe-current-group + "u" gnus-browse-toggle-subscription "l" gnus-browse-exit "L" gnus-browse-exit "q" gnus-browse-exit @@ -735,7 +735,7 @@ claim them." (easy-menu-define gnus-browse-menu gnus-browse-mode-map "" '("Browse" - ["Subscribe" gnus-browse-unsubscribe-current-group t] + ["Toggle Subscribe" gnus-browse-toggle-subscription t] ["Read" gnus-browse-read-group t] ["Select" gnus-browse-select-group t] ["Describe" gnus-browse-describe-group t] @@ -881,9 +881,9 @@ All normal editing commands are switched off. \\ The only things you can do in this buffer is -1) `\\[gnus-browse-unsubscribe-current-group]' to subscribe to a group. -The group will be inserted into the group buffer upon exit from this -buffer. +1) `\\[gnus-browse-toggle-subscription]' to subscribe or unsubscribe to +a group. The group will be inserted into the group buffer upon exit from +this buffer. 2) `\\[gnus-browse-read-group]' to read a group ephemerally. @@ -933,7 +933,12 @@ If NUMBER, fetch this number of articles." (interactive "p" gnus-browse-mode) (gnus-browse-next-group (- n))) -(defun gnus-browse-unsubscribe-current-group (arg) +(define-obsolete-function-alias 'gnus-browse-unsubscribe-current-group + 'gnus-browse-toggle-subscription-at-point "28.1") +(define-obsolete-function-alias 'gnus-browse-unsubscribe-group + 'gnus-browse-toggle-subscription "28.1") + +(defun gnus-browse-toggle-subscription-at-point (arg) "(Un)subscribe to the next ARG groups. The variable `gnus-browse-subscribe-newsgroup-method' determines how new groups will be entered into the group buffer." @@ -944,7 +949,7 @@ how new groups will be entered into the group buffer." (arg (abs arg))) (while (and (> arg 0) (not (eobp)) - (gnus-browse-unsubscribe-group) + (gnus-browse-toggle-subscription) (zerop (gnus-browse-next-group ward))) (cl-decf arg)) (gnus-group-position-point) @@ -976,7 +981,7 @@ doing the deletion." gnus-browse-mode) (gnus-group-delete-group group force)) -(defun gnus-browse-unsubscribe-group () +(defun gnus-browse-toggle-subscription () "Toggle subscription of the current group in the browse buffer." (let ((sub nil) (buffer-read-only nil) commit fa51d6cdcd49dad21c9e6ede878467cab95630b0 Author: Lars Ingebrigtsen Date: Wed Jul 28 18:39:39 2021 +0200 Improve mode-line-position-column-format manual entry * doc/lispref/modes.texi (Mode Line Variables): Mention %C, and don't mention the obsolete column-number-indicator-zero-based variable. diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index b0dc0ff916..d48c9cc1af 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -2251,16 +2251,15 @@ number. The format used to display column numbers when @code{column-number-mode} (@pxref{Optional Mode Line,,, emacs, The GNU Emacs Manual}) is switched on. @samp{%c} in the format will be -replaced with the column number, and this is zero-based if -@code{column-number-indicator-zero-based} is non-@code{nil}, and -one-based if @code{column-number-indicator-zero-based} is @code{nil}. +replaced with a zero-based column number, and @samp{%C} will be +replaced with a one-based column number. @end defvar @defvar mode-line-position-column-line-format The format used to display column numbers when both @code{line-number-mode} and @code{column-number-mode} are switched on. -See the previous two variables for the meaning of the @samp{%l} and -@samp{%c} format specs. +See the previous two variables for the meaning of the @samp{%l}, +@samp{%c} and @samp{%C} format specs. @end defvar @defvar minor-mode-alist commit ea69802a8f7e9582d2218dceec3fb283e85982e9 Author: Juri Linkov Date: Wed Jul 28 19:22:53 2021 +0300 * lisp/progmodes/gud.el: Add prefix 'gud-' to repeat-map variables (bug#49632) * lisp/progmodes/gud.el (gud-sdb-repeat-map, gud-dbx-repeat-map) (gud-xdb-repeat-map, gud-perldb-repeat-map, gud-pdb-repeat-map) (gud-guiler-repeat-map, gud-jdb-repeat-map): Rename with prefix 'gud-'. diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index ba438d651b..05ad82acc4 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1037,7 +1037,7 @@ SKIP is the number of chars to skip on each line, it defaults to 0." (defvar gud-sdb-lastfile nil) -(defvar sdb-repeat-map +(defvar gud-sdb-repeat-map (let ((map (make-sparse-keymap))) (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next) ("s" . gud-step) @@ -1119,7 +1119,7 @@ and source-file directory for your debugger." (gud-def gud-cont "c" "\C-r" "Continue with display.") (gud-def gud-print "%e/" "\C-p" "Evaluate C expression at point.") - (gud-set-repeat-map-property 'sdb-repeat-map) + (gud-set-repeat-map-property 'gud-sdb-repeat-map) (setq comint-prompt-regexp "\$^\\|\n\$\\*") (setq paragraph-start comint-prompt-regexp) @@ -1279,7 +1279,7 @@ whereby $stopformat=1 produces an output format compatible with ;; whereby `set $stopformat=1' reportedly produces output compatible ;; with `gud-dbx-marker-filter', which we prefer. -(defvar dbx-repeat-map +(defvar gud-dbx-repeat-map (let ((map (make-sparse-keymap))) (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next) ("s" . gud-step) @@ -1443,7 +1443,7 @@ and source-file directory for your debugger." (gud-def gud-print "print %e" "\C-p" "Evaluate C expression at point.") (gud-def gud-run "run" nil "Run the program.") - (gud-set-repeat-map-property 'dbx-repeat-map) + (gud-set-repeat-map-property 'gud-dbx-repeat-map) (setq comint-prompt-regexp "^[^)\n]*dbx) *") (setq paragraph-start comint-prompt-regexp) @@ -1456,7 +1456,7 @@ and source-file directory for your debugger." ;; History of argument lists passed to xdb. (defvar gud-xdb-history nil) -(defvar xdb-repeat-map +(defvar gud-xdb-repeat-map (let ((map (make-sparse-keymap))) (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next) ("s" . gud-step) @@ -1536,7 +1536,7 @@ directories if your program contains sources from more than one directory." (gud-def gud-finish "bu\\t" "\C-f" "Finish executing current function.") (gud-def gud-print "p %e" "\C-p" "Evaluate C expression at point.") - (gud-set-repeat-map-property 'xdb-repeat-map) + (gud-set-repeat-map-property 'gud-xdb-repeat-map) (setq comint-prompt-regexp "^>") (setq paragraph-start comint-prompt-regexp) @@ -1548,7 +1548,7 @@ directories if your program contains sources from more than one directory." ;; History of argument lists passed to perldb. (defvar gud-perldb-history nil) -(defvar perldb-repeat-map +(defvar gud-perldb-repeat-map (let ((map (make-sparse-keymap))) (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next) ("s" . gud-step) @@ -1701,7 +1701,7 @@ and source-file directory for your debugger." (gud-def gud-print "p %e" "\C-p" "Evaluate perl expression at point.") (gud-def gud-until "c %l" "\C-u" "Continue to current line.") - (gud-set-repeat-map-property 'perldb-repeat-map) + (gud-set-repeat-map-property 'gud-perldb-repeat-map) (setq comint-prompt-regexp "^ DB<+[0-9]+>+ ") (setq paragraph-start comint-prompt-regexp) @@ -1730,7 +1730,7 @@ and source-file directory for your debugger." (defvar gud-pdb-marker-regexp-start "^> ") -(defvar pdb-repeat-map +(defvar gud-pdb-repeat-map (let ((map (make-sparse-keymap))) (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next) ("s" . gud-step) @@ -1833,7 +1833,7 @@ directory and source-file directory for your debugger." (gud-def gud-print "p %e" "\C-p" "Evaluate Python expression at point.") (gud-def gud-statement "!%e" "\C-e" "Execute Python statement at point.") - (gud-set-repeat-map-property 'pdb-repeat-map) + (gud-set-repeat-map-property 'gud-pdb-repeat-map) ;; (setq comint-prompt-regexp "^(.*pdb[+]?) *") (setq comint-prompt-regexp "^(Pdb) *") @@ -1848,7 +1848,7 @@ directory and source-file directory for your debugger." (defvar gud-guiler-lastfile nil) -(defvar guiler-repeat-map +(defvar gud-guiler-repeat-map (let ((map (make-sparse-keymap))) (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next) ("s" . gud-step) @@ -1926,7 +1926,7 @@ and source-file directory for your debugger." (gud-def gud-down ",down" ">" "Down one stack frame.") (gud-def gud-print "%e" "\C-p" "Evaluate Guile expression at point.") - (gud-set-repeat-map-property 'guiler-repeat-map) + (gud-set-repeat-map-property 'gud-guiler-repeat-map) (setq comint-prompt-regexp "^scheme@([^>]+> ") (setq paragraph-start comint-prompt-regexp) @@ -2373,7 +2373,7 @@ extension EXTN. Normally EXTN is given as the regular expression ;; Note: Reset to this value every time a prompt is seen (defvar gud-jdb-lowest-stack-level 999) -(defvar jdb-repeat-map +(defvar gud-jdb-repeat-map (let ((map (make-sparse-keymap))) (pcase-dolist (`(,key . ,cmd) '(("n" . gud-next) ("s" . gud-step) @@ -2596,7 +2596,7 @@ gud, see `gud-mode'." (gud-def gud-print "print %e" "\C-p" "Print value of expression at point.") (gud-def gud-pstar "dump %e" nil "Print all object information at point.") - (gud-set-repeat-map-property 'jdb-repeat-map) + (gud-set-repeat-map-property 'gud-jdb-repeat-map) (setq comint-prompt-regexp "^> \\|^[^ ]+\\[[0-9]+\\] ") (setq paragraph-start comint-prompt-regexp) commit c9c1460342a5aadf3819ceb6ee5ac28c14760fce Author: Lars Ingebrigtsen Date: Wed Jul 28 18:10:59 2021 +0200 Make byte-recompile-directory less brittle * lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): Don't interpret files named "~" as $HOME (bug#49758). diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 1b64a06fe4..a6e7e03cb0 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1857,8 +1857,8 @@ also be compiled." (while directories (setq directory (car directories)) (message "Checking %s..." directory) - (dolist (file (directory-files directory)) - (let ((source (expand-file-name file directory))) + (dolist (source (directory-files directory t)) + (let ((file (file-name-nondirectory source))) (if (file-directory-p source) (and (not (member file '("RCS" "CVS"))) (not (eq ?\. (aref file 0))) commit e5ddf91db2429e87ab16c69d774295648bbb4e43 Author: Lars Ingebrigtsen Date: Wed Jul 28 17:57:19 2021 +0200 Improve mode-line-position-column-format doc string * lisp/bindings.el (mode-line-position-column-format): Improve doc string. (mode-line-position-line-format): Point to `mode-line-position-column-line-format'. diff --git a/lisp/bindings.el b/lisp/bindings.el index 4b194c0c01..8e5799fbe8 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -463,7 +463,9 @@ displayed in `mode-line-position', a component of the default (defcustom mode-line-position-line-format '(" L%l") "Format used to display line numbers in the mode line. This is used when `line-number-mode' is switched on. The \"%l\" -format spec will be replaced by the line number." +format spec will be replaced by the line number. + +Also see `mode-line-position-column-line-format'." :type '(list string) :version "28.1" :group 'mode-line) @@ -471,9 +473,10 @@ format spec will be replaced by the line number." (defcustom mode-line-position-column-format '(" C%c") "Format used to display column numbers in the mode line. This is used when `column-number-mode' is switched on. The -\"%c\" format spec will be replaced by the column number, which -is zero-based if `column-number-indicator-zero-based' is non-nil, -and one-based if `column-number-indicator-zero-based' is nil." +\"%c\" format spec is replaced by the zero-based column number, +and \"%C\" is replaced by the one-based column number. + +Also see `mode-line-position-column-line-format'." :type '(list string) :version "28.1" :group 'mode-line) commit 6a6ea7bc6f5ceb02966c7256b8d16eb0aaa725ae Author: Kévin Le Gouguec Date: Wed Jul 28 17:38:41 2021 +0200 Improve file-name-concat NEWS entry diff --git a/etc/NEWS b/etc/NEWS index 3513fa4d64..ce5c960f61 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3116,7 +3116,8 @@ The former is now declared obsolete. +++ *** New function 'file-name-concat'. -This appends path components to a directory name and returns the result. +This appends file name components to a directory name and returns the +result. +++ *** New function 'split-string-shell-command'.