commit 6e865a7171d80cd91b54c6d71b88d960b920abe3 (HEAD, refs/remotes/origin/master) Author: Po Lu Date: Fri Dec 10 14:20:32 2021 +0800 Further reduce image-related stutter during precision scrolling * lisp/pixel-scroll.el (pixel-scroll-precision-scroll-down-page): Disable `scroll-preserve-screen-position' and `auto-window-vscroll' while scrolling. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index 5425462caf..336b555e77 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -453,7 +453,9 @@ the height of the current window." (goto-char desired-start) (when (zerop (vertical-motion (1+ scroll-margin))) (signal 'end-of-buffer nil)) - (point)))) + (point))) + (scroll-preserve-screen-position nil) + (auto-window-vscroll nil)) (when (and (or (< (point) next-pos)) (let ((pos-visibility (pos-visible-in-window-p next-pos nil t))) (and pos-visibility commit 636704fab96bf32809adf392df84d9a80e40de21 Author: Po Lu Date: Fri Dec 10 06:01:44 2021 +0000 Stop setting `make-cursor-line-fully-visible' in precision scrolling * lisp/pixel-scroll.el (pixel-scroll-precision-mode): Stop setting `make-cursor-line-fully-visible'. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index 29d8e7e025..5425462caf 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -714,8 +714,6 @@ precisely, according to the turning of the mouse wheel." :group 'mouse :keymap pixel-scroll-precision-mode-map (setq mwheel-coalesce-scroll-events - (not pixel-scroll-precision-mode) - make-cursor-line-fully-visible (not pixel-scroll-precision-mode))) (provide 'pixel-scroll) commit d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb Merge: 59db96d83a 7a25ba0fde Author: Stefan Kangas Date: Fri Dec 10 06:30:33 2021 +0100 Merge from origin/emacs-28 7a25ba0fde ; * lisp/image-dired.el: Fix typo. dda6337066 emacsclient takes more care about XDG_RUNTIME_DIR 26fb4168b8 ; Prefer HTTPS in more URLs 6b89578524 ; * lisp/progmodes/flymake.el: Update the minimum Emacs ve... commit 59db96d83ae837b3a3d82a979cd97a271bcd86bf Author: Po Lu Date: Fri Dec 10 11:30:07 2021 +0800 Fix bob detection when pixel scrolling upwards * lisp/pixel-scroll.el (pixel-point-and-height-at-unseen-line): Don't go to the beginning-of-visual-line if bobp. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index 432a5dc52c..29d8e7e025 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -399,7 +399,8 @@ character on the unseen line just above the scope of current window, and the pixel height of that line." (let* ((pos0 (save-excursion (goto-char (window-start)) - (beginning-of-visual-line) + (unless (bobp) + (beginning-of-visual-line)) (point))) (vscroll0 (window-vscroll nil t)) (line-height nil) commit 2e4740f04239ee441685b2f43d156efcf6359383 Author: Po Lu Date: Fri Dec 10 11:25:10 2021 +0800 Fix pixel scrolling upwards in Info buffers * lisp/pixel-scroll.el (pixel-point-and-height-at-unseen-line): Don't blindly trust window start to be the beginning of a visual line. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index 813fbb0711..432a5dc52c 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -397,7 +397,10 @@ returns nil." The returned value is a cons of the position of the first character on the unseen line just above the scope of current window, and the pixel height of that line." - (let* ((pos0 (window-start)) + (let* ((pos0 (save-excursion + (goto-char (window-start)) + (beginning-of-visual-line) + (point))) (vscroll0 (window-vscroll nil t)) (line-height nil) (pos @@ -407,8 +410,7 @@ window, and the pixel height of that line." (point-min) (vertical-motion -1) (setq line-height - (cdr (window-text-pixel-size nil (point) - pos0))) + (cdr (window-text-pixel-size nil (point) pos0))) (point))))) ;; restore initial position (set-window-start nil pos0 t) commit e8d90a3fd402c0c67bf4b4b29ac26108ead8845d Author: Po Lu Date: Fri Dec 10 10:38:24 2021 +0800 Remove unused let-bindings from pixel-scroll.el * lisp/pixel-scroll.el (pixel-scroll-precision-scroll-down-page): Remove unused bindings. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index d7ce0bcdd9..813fbb0711 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -436,7 +436,6 @@ the height of the current window." (let* ((desired-pos (posn-at-x-y 0 (+ delta (window-tab-line-height) (window-header-line-height)))) - (object (posn-object desired-pos)) (desired-start (posn-point desired-pos)) (current-vs (window-vscroll nil t)) (start-posn (unless (eq desired-start (window-start)) @@ -451,10 +450,7 @@ the height of the current window." (goto-char desired-start) (when (zerop (vertical-motion (1+ scroll-margin))) (signal 'end-of-buffer nil)) - (point))) - (end-pos (posn-at-x-y 0 (+ usable-height - (window-tab-line-height) - (window-header-line-height))))) + (point)))) (when (and (or (< (point) next-pos)) (let ((pos-visibility (pos-visible-in-window-p next-pos nil t))) (and pos-visibility commit b867eb2216827fa90a8d3c647f80f77dc4ca3bf8 Author: Po Lu Date: Fri Dec 10 10:33:00 2021 +0800 Fix precision scrolling for stretch glyphs * lisp/pixel-scroll.el (pixel-scroll-precision-scroll-down-page): Simplify logic. (pixel-scroll-precision-interpolate): Block throw-on-input when actually scrolling. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index ead841c982..d7ce0bcdd9 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -438,10 +438,12 @@ the height of the current window." (window-header-line-height)))) (object (posn-object desired-pos)) (desired-start (posn-point desired-pos)) - (scroll-area-total-height (cdr (window-text-pixel-size nil - (window-start) - (1- desired-start)))) - (desired-vscroll (- delta scroll-area-total-height)) + (current-vs (window-vscroll nil t)) + (start-posn (unless (eq desired-start (window-start)) + (posn-at-point desired-start))) + (desired-vscroll (if start-posn + (- delta (cdr (posn-x-y start-posn))) + (+ current-vs delta))) (edges (window-edges nil t)) (usable-height (- (nth 3 edges) (nth 1 edges))) @@ -453,33 +455,22 @@ the height of the current window." (end-pos (posn-at-x-y 0 (+ usable-height (window-tab-line-height) (window-header-line-height))))) - (if (or (overlayp object) - (stringp object) - (and (consp object) - (stringp (car object))) - (and (consp (posn-object end-pos)) - (> (cdr (posn-object-x-y end-pos)) 0))) - ;; We are either on an overlay or a string, so set vscroll - ;; directly. - (set-window-vscroll nil (+ (window-vscroll nil t) - delta) - t) - (when (and (or (< (point) next-pos)) - (let ((pos-visibility (pos-visible-in-window-p next-pos nil t))) - (and pos-visibility - (or (eq (length pos-visibility) 2) - (when-let* ((posn (posn-at-point next-pos))) - (> (cdr (posn-object-width-height posn)) - usable-height)))))) - (goto-char next-pos)) - (set-window-start nil (if (zerop (window-hscroll)) - desired-start - (save-excursion - (goto-char desired-start) - (beginning-of-visual-line) - (point))) - t) - (set-window-vscroll nil desired-vscroll t)))) + (when (and (or (< (point) next-pos)) + (let ((pos-visibility (pos-visible-in-window-p next-pos nil t))) + (and pos-visibility + (or (eq (length pos-visibility) 2) + (when-let* ((posn (posn-at-point next-pos))) + (> (cdr (posn-object-width-height posn)) + usable-height)))))) + (goto-char next-pos)) + (set-window-start nil (if (zerop (window-hscroll)) + desired-start + (save-excursion + (goto-char desired-start) + (beginning-of-visual-line) + (point))) + t) + (set-window-vscroll nil desired-vscroll t))) (defun pixel-scroll-precision-scroll-down (delta) "Scroll the current window down by DELTA pixels." @@ -558,13 +549,14 @@ animation." (setq time-elapsed (+ time-elapsed (- (float-time) last-time)) percentage (/ time-elapsed total-time)) - (if (< delta 0) - (pixel-scroll-precision-scroll-down - (ceiling (abs (* (* delta factor) - (/ between-scroll total-time))))) - (pixel-scroll-precision-scroll-up - (ceiling (* (* delta factor) - (/ between-scroll total-time))))) + (let ((throw-on-input nil)) + (if (< delta 0) + (pixel-scroll-precision-scroll-down + (ceiling (abs (* (* delta factor) + (/ between-scroll total-time))))) + (pixel-scroll-precision-scroll-up + (ceiling (* (* delta factor) + (/ between-scroll total-time)))))) (setq last-time (float-time))) (if (< percentage 1) (progn commit e796161b6e640b00b8ab584f843f70e59a34c078 Author: Stefan Kangas Date: Fri Dec 10 03:11:49 2021 +0100 * lisp/time.el (world-clock-mode-map): Convert to defvar-keymap. diff --git a/lisp/time.el b/lisp/time.el index 4f302caa67..fcea064b4c 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -526,11 +526,9 @@ If the value is t instead of an alist, use the value of '((t :inherit font-lock-variable-name-face)) "Face for time zone label in `world-clock' buffer.") -(defvar world-clock-mode-map - (let ((map (make-sparse-keymap))) - (define-key map "n" #'next-line) - (define-key map "p" #'previous-line) - map)) +(defvar-keymap world-clock-mode-map + "n" #'next-line + "p" #'previous-line) (define-derived-mode world-clock-mode special-mode "World clock" "Major mode for buffer that displays times in various time zones. commit 8c2c8996e76381eecfd4ab5cf07561abc0b87a1d Author: Stefan Kangas Date: Fri Dec 10 03:03:06 2021 +0100 ; * lisp/Makefile.in: Fix typo. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 353c9e652c..df9e5c36ee 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -60,7 +60,7 @@ BYTE_COMPILE_EXTRA_FLAGS = # The example above is just for developers, it should not be used by default. # Those automatically generated autoload files that need special rules -# to build; ie not including things created via generated-autoload-file +# to build; i.e. not including things created via generated-autoload-file # (eg calc/calc-loaddefs.el). LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ $(lisp)/calendar/diary-loaddefs.el \ commit 57923818fccb687af78a9d966eb56a606ede5a8c Author: Stefan Kangas Date: Fri Dec 10 02:56:08 2021 +0100 ; * lisp/htmlfontify.el: Remove some commented out code. diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 9fe6e825f7..8dc4cce323 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -77,6 +77,7 @@ ;; Changes: moved to changelog (CHANGES) file. ;;; Code: + (eval-when-compile (require 'cl-lib)) (require 'cus-edit) @@ -2307,10 +2308,6 @@ See also `hfy-load-tags-cache'." (interactive "D source directory: ") (hfy-load-tags-cache (directory-file-name srcdir))) -;;(defun hfy-test-read-args (foo bar) -;; (interactive "D source directory: \nD target directory: ") -;; (message "foo: %S\nbar: %S" foo bar)) - (defun hfy-save-kill-buffers (buffer-list &optional dstdir) (dolist (B buffer-list) (set-buffer B) commit 7a25ba0fdebf5e94fa5a3a3d992424f86b1547cc (refs/remotes/origin/emacs-28) Author: Stefan Kangas Date: Fri Dec 10 02:33:48 2021 +0100 ; * lisp/image-dired.el: Fix typo. diff --git a/lisp/image-dired.el b/lisp/image-dired.el index 329085c823..3ac44dac9f 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -41,7 +41,7 @@ ;; ;; I briefly tried out thumbs.el, and although it seemed more ;; powerful than this package, it did not work the way I wanted to. It -;; was too slow to created thumbnails of all files in a directory (I +;; was too slow to create thumbnails of all files in a directory (I ;; currently keep all my 2000+ images in the same directory) and ;; browsing the thumbnail buffer was slow too. image-dired.el will not ;; create thumbnails until they are needed and the browsing is done commit dda63370669dba6dfda53dec62de8b1c1c275b2d Author: Paul Eggert Date: Thu Dec 9 09:03:10 2021 -0800 emacsclient takes more care about XDG_RUNTIME_DIR * lib-src/emacsclient.c (set_local_socket): Revert to the Emacs 27 behavior of not trying TMPDIR if XDG_RUNTIME_DIR is set. This is one of the suggestions made by Jim Porter and independently by Ulrich Mueller in Bug#51327. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index cff3cec2a7..d11fd88c45 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1456,7 +1456,6 @@ set_local_socket (char const *server_name) else { /* socket_name is a file name component. */ - sock_status = ENOENT; char const *xdg_runtime_dir = egetenv ("XDG_RUNTIME_DIR"); if (xdg_runtime_dir) { @@ -1466,7 +1465,7 @@ set_local_socket (char const *server_name) ? connect_socket (AT_FDCWD, sockname, s, 0) : ENAMETOOLONG); } - if (sock_status == ENOENT) + else { char const *tmpdir = egetenv ("TMPDIR"); if (tmpdir) commit c0b9041ebde82907711cc00a7c307fe622fb541c Author: Eli Zaretskii Date: Thu Dec 9 21:29:32 2021 +0200 Fix logic in 'compute_window_start_on_continuation_line' * src/xdisp.c (compute_window_start_on_continuation_line): Fix a thinko in logic. Patch by dickmao . (Bug#52378) diff --git a/src/xdisp.c b/src/xdisp.c index 813858422d..89b295932e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -18089,7 +18089,7 @@ compute_window_start_on_continuation_line (struct window *w) point will not be visible with any window start we compute. */ if (IT_CHARPOS (it) <= PT - || (CHARPOS (start_pos) - IT_CHARPOS (it) + && (CHARPOS (start_pos) - IT_CHARPOS (it) /* PXW: Do we need upper bounds here? */ < WINDOW_TOTAL_LINES (w) * WINDOW_TOTAL_COLS (w))) { commit 8f3f785c555458f01759c376d700663e7d8dbc38 Author: Michael Albinus Date: Thu Dec 9 20:11:40 2021 +0100 Fix thinko in Tramp test * test/lisp/net/tramp-tests.el (tramp-test07-abbreviate-file-name): Fix thinko. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index a572ff83d3..9c65f9a635 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -239,8 +239,7 @@ is greater than 10. (unwind-protect (progn ,@body) (tramp--test-message - "%s %f sec" - ,message (float-time (time-subtract nil start)))))) + "%s %f sec" ,message (float-time (time-subtract nil start)))))) ;; `always' is introduced with Emacs 28.1. (defalias 'tramp--test-always @@ -2291,7 +2290,7 @@ This checks also `file-name-as-directory', `file-name-directory', "Check that Tramp abbreviates file names correctly." (skip-unless (tramp--test-enabled)) (skip-unless (tramp--test-emacs29-p)) - (skip-unless (tramp--test-ange-ftp-p)) + (skip-unless (not (tramp--test-ange-ftp-p))) (let* ((remote-host (file-remote-p tramp-test-temporary-file-directory)) ;; Not all methods can expand "~". commit bbfb37378366f28696760153279a2d55b3e8faf9 Author: Michael Albinus Date: Thu Dec 9 20:03:16 2021 +0100 Improve lock-pid handling in Tramp * lisp/net/tramp-cache.el: Remove comment. * lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection): * lisp/net/tramp-rclone.el (tramp-rclone-maybe-open-connection): * lisp/net/tramp-sshfs.el (tramp-sshfs-maybe-open-connection): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-maybe-open-connection): Do not set "lock-pid" connection-property. (tramp-sudoedit-handle-delete-file): Use "rm -f". * lisp/net/tramp.el (tramp-test-message): Extend for buffers w/o remote default-directory. (tramp-lock-pid): New defvar. (tramp-get-lock-pid): Reimplement. diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index f2be297d59..b909c5706d 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -49,8 +49,6 @@ ;; an open connection. Examples: "scripts" keeps shell script ;; definitions already sent to the remote shell, "last-cmd-time" is ;; the time stamp a command has been sent to the remote process. -;; "lock-pid" is the timestamp a (network) process is created, it is -;; used instead of the pid in file locks. ;; ;; - The key is nil. These are temporary properties related to the ;; local machine. Examples: "parse-passwd" and "parse-group" keep diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index d7af0d34bd..6b0299aa09 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -2125,9 +2125,6 @@ connection if a previous connection has died for some reason." (process-put p 'vector vec) (set-process-query-on-exit-flag p nil) - ;; Mark process for filelock. - (tramp-set-connection-property p "lock-pid" (truncate (time-to-seconds))) - ;; Set connection-local variables. (tramp-set-connection-local-variables vec))) diff --git a/lisp/net/tramp-rclone.el b/lisp/net/tramp-rclone.el index 09862c6a04..71ec2607a3 100644 --- a/lisp/net/tramp-rclone.el +++ b/lisp/net/tramp-rclone.el @@ -368,10 +368,6 @@ connection if a previous connection has died for some reason." (process-put p 'vector vec) (set-process-query-on-exit-flag p nil) - ;; Mark process for filelock. - (tramp-set-connection-property - p "lock-pid" (truncate (time-to-seconds))) - ;; Set connection-local variables. (tramp-set-connection-local-variables vec))) diff --git a/lisp/net/tramp-sshfs.el b/lisp/net/tramp-sshfs.el index a19c99316e..ef1f302546 100644 --- a/lisp/net/tramp-sshfs.el +++ b/lisp/net/tramp-sshfs.el @@ -345,9 +345,6 @@ connection if a previous connection has died for some reason." (process-put p 'vector vec) (set-process-query-on-exit-flag p nil) - ;; Mark process for filelock. - (tramp-set-connection-property p "lock-pid" (truncate (time-to-seconds))) - ;; Set connection-local variables. (tramp-set-connection-local-variables vec))) diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el index 0309b6b022..88e8c43534 100644 --- a/lisp/net/tramp-sudoedit.el +++ b/lisp/net/tramp-sudoedit.el @@ -336,7 +336,7 @@ absolute file names." (if (and delete-by-moving-to-trash trash) (move-file-to-trash filename) (unless (tramp-sudoedit-send-command - v "rm" (tramp-compat-file-name-unquote localname)) + v "rm" "-f" (tramp-compat-file-name-unquote localname)) ;; Propagate the error. (with-current-buffer (tramp-get-connection-buffer v) (goto-char (point-min)) @@ -788,9 +788,6 @@ connection if a previous connection has died for some reason." (process-put p 'vector vec) (set-process-query-on-exit-flag p nil) - ;; Mark process for filelock. - (tramp-set-connection-property p "lock-pid" (truncate (time-to-seconds))) - ;; Set connection-local variables. (tramp-set-connection-local-variables vec) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 7dddd84e55..6b05dadc0e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2233,10 +2233,14 @@ the resulting error message." (defun tramp-test-message (fmt-string &rest arguments) "Emit a Tramp message according `default-directory'." - (if (tramp-tramp-file-p default-directory) - (apply #'tramp-message - (tramp-dissect-file-name default-directory) 0 fmt-string arguments) - (apply #'message fmt-string arguments))) + (cond + ((tramp-tramp-file-p default-directory) + (apply #'tramp-message + (tramp-dissect-file-name default-directory) 0 fmt-string arguments)) + ((tramp-file-name-p (car tramp-current-connection)) + (apply #'tramp-message + (car tramp-current-connection) 0 fmt-string arguments)) + (t (apply #'message fmt-string arguments)))) (put #'tramp-test-message 'tramp-suppress-trace t) @@ -3958,16 +3962,19 @@ Return nil when there is no lockfile." (insert-file-contents-literally lockname) (buffer-string)))))) +(defvar tramp-lock-pid nil + "A random nunber local for every connection. +Do not set it manually, it is used buffer-local in `tramp-get-lock-pid'") + (defun tramp-get-lock-pid (file) "Determine pid for lockfile of FILE." - ;; Some Tramp methods do not offer a connection process, but just a - ;; network process as a place holder. Those processes use the - ;; "lock-pid" connection property as fake pid, in fact it is the - ;; time stamp the process is created. - (let ((p (tramp-get-process (tramp-dissect-file-name file)))) - (number-to-string - (or (process-id p) - (tramp-get-connection-property p "lock-pid" (emacs-pid)))))) + ;; Not all Tramp methods use an own process. So we use a random + ;; number, which is as good as a process id. + (with-current-buffer + (tramp-get-connection-buffer (tramp-dissect-file-name file)) + (or tramp-lock-pid + (setq-local + tramp-lock-pid (number-to-string (random most-positive-fixnum)))))) (defconst tramp-lock-file-info-regexp ;; USER@HOST.PID[:BOOT_TIME] commit 26fb4168b884eeb910580c42e87efb73399019c9 Author: Stefan Kangas Date: Thu Dec 9 16:22:17 2021 +0100 ; Prefer HTTPS in more URLs diff --git a/ChangeLog.1 b/ChangeLog.1 index 82e0ad5c2b..756dce3e47 100644 --- a/ChangeLog.1 +++ b/ChangeLog.1 @@ -2326,7 +2326,7 @@ 2013-07-03 Christoph Egger (tiny change) * configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang. - http://bugs.debian.org/712974 + https://bugs.debian.org/712974 2013-07-02 Paul Eggert diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index a4ca54a8b0..603bf42e0c 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi @@ -464,7 +464,7 @@ your status as ``being back'' if you do not. People can use the @cindex help about irc Typical IRC servers implement many more commands. You can read more about the fantastic world of IRC online at -@uref{http://www.irchelp.org/, the Internet Relay Chat (IRC) help +@uref{https://www.irchelp.org/, the Internet Relay Chat (IRC) help archive}. @node Configuration diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index a17a8d67e5..27ad912523 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -4228,7 +4228,7 @@ It is even possible to access file archives in file archives, as (progn (url-handler-mode 1) (find-file - "http://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control")) + "https://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control")) @end group @end lisp diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 8f15e11007..90e38e5d30 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -90,7 +90,7 @@ can be accessed (usually over a network) in a specific way. @example ftp://ftp.is.co.za/rfc/rfc1808.txt -http://www.ietf.org/rfc/rfc2396.txt +https://www.ietf.org/rfc/rfc2396.txt ldap://[2001:db8::7]/c=GB?objectClass?one mailto:John.Doe@@example.com news:comp.infosystems.www.servers.unix @@ -708,7 +708,7 @@ Well-known ports are used if the URL does not specify a port. @cindex rcirc The @code{irc} scheme is defined in the Internet Draft at -@url{http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which +@url{https://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which was never approved as an RFC). Such URLs have the form @example @@ -1181,7 +1181,7 @@ opened by the URL library. @c machines off the local network. This is characterized by being able @c to reach someplace with a raw ip number, but not its hostname @c (@url{http://129.79.254.191/} works, but -@c @url{http://www.cs.indiana.edu/} doesn't). This used to happen on +@c @url{https://www.cs.indiana.edu/} doesn't). This used to happen on @c SunOS4 and Ultrix, but is now probably now rare. If Emacs can't be @c rebuilt linked against the resolver library, it can use the external @c @command{nslookup} program instead. diff --git a/leim/MISC-DIC/README b/leim/MISC-DIC/README index 74ae75289b..f205ecd725 100644 --- a/leim/MISC-DIC/README +++ b/leim/MISC-DIC/README @@ -20,7 +20,7 @@ license notice. They are copies of those distributed with a free package called CCE at: - http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz + https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz As the original files don't contain copyright and license notices, a proper notice is extracted from the file Copyright and added at the diff --git a/leim/MISC-DIC/pinyin.map b/leim/MISC-DIC/pinyin.map index 4809769d1a..e206564bcd 100644 --- a/leim/MISC-DIC/pinyin.map +++ b/leim/MISC-DIC/pinyin.map @@ -3,7 +3,7 @@ % This file is included in the free package called CCE. It is % available in: % -% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz +% https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz % % As the file itself doesn't contain copyright and license notices, % the following statements of the file cce/Copyright covers it. diff --git a/leim/MISC-DIC/ziranma.cin b/leim/MISC-DIC/ziranma.cin index b61aea2b6f..b276e888a0 100644 --- a/leim/MISC-DIC/ziranma.cin +++ b/leim/MISC-DIC/ziranma.cin @@ -3,7 +3,7 @@ % This file is included in the free package called CCE. It is % available in: % -% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz +% https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz % % As the file itself doesn't contain copyright and license notices, % the following statements of the file cce/Copyright covers it. diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index 14a6c5d06e..4dd3df5953 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -10766,7 +10766,7 @@ * emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value. (find-gc-source-files): Update some names. (trace-call-tree): Simplify and update. - Avoid predictable temp-file names. (http://bugs.debian.org/747100) + Avoid predictable temp-file names. (https://bugs.debian.org/747100) This is CVE-2014-3422. 2014-05-08 Stefan Monnier @@ -17742,7 +17742,7 @@ 2013-10-13 Glenn Morris * progmodes/sh-script.el (sh-mark-line, sh-learn-buffer-indent): - Occur buffers are read-only. http://bugs.debian.org/720775 + Occur buffers are read-only. https://bugs.debian.org/720775 * emacs-lisp/authors.el (authors-fixed-entries): Comment out old alpha stuff. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 35402dffd0..26ecaada5e 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -1759,7 +1759,7 @@ * pgg-gpg.el, pgg-pgp.el, pgg-pgp5.el, pgg.el: Reapply changes from 2003-04-03 to fix security problem. - See http://www.debian.org/security/2003/dsa-339. + See https://www.debian.org/security/2003/dsa-339. 2003-07-23 Teodor Zlatanov diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3 index 2aba3a5706..836cca87ff 100644 --- a/lisp/gnus/ChangeLog.3 +++ b/lisp/gnus/ChangeLog.3 @@ -655,7 +655,7 @@ 2014-05-08 Glenn Morris * gnus-fun.el (gnus-grab-cam-face): - Do not use predictable temp-file name. (http://bugs.debian.org/747100) + Do not use predictable temp-file name. (https://bugs.debian.org/747100) This is CVE-2014-3421. 2014-05-04 Glenn Morris diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index e87bb343cf..2201ce22a2 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -10218,7 +10218,7 @@ it can fail if the user's MH environment is not setup correctly). I now set the value of mh-folder-unseen-seq-name at runtime when I first need it. This should fix Debian bugs - http://bugs.debian.org/140232 and http://bugs.debian.org/140817 + https://bugs.debian.org/140232 and https://bugs.debian.org/140817 2002-03-25 Peter S Galbraith diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index c7a87a6cc1..03a297ca41 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -4,7 +4,7 @@ ;; Author: Ulf Jasper ;; Filename: newst-backend.el -;; URL: http://www.nongnu.org/newsticker +;; URL: https://www.nongnu.org/newsticker ;; Keywords: News, RSS, Atom ;; Package: newsticker diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el index 40e304402a..b228ea9a60 100644 --- a/lisp/net/newst-reader.el +++ b/lisp/net/newst-reader.el @@ -4,7 +4,7 @@ ;; Author: Ulf Jasper ;; Filename: newst-reader.el -;; URL: http://www.nongnu.org/newsticker +;; URL: https://www.nongnu.org/newsticker ;; Package: newsticker ;; ====================================================================== diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el index 8cfafb5bfe..068b862b69 100644 --- a/lisp/net/newst-ticker.el +++ b/lisp/net/newst-ticker.el @@ -4,7 +4,7 @@ ;; Author: Ulf Jasper ;; Filename: newst-ticker.el -;; URL: http://www.nongnu.org/newsticker +;; URL: https://www.nongnu.org/newsticker ;; Keywords: News, RSS, Atom ;; Package: newsticker diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index c1714218be..52576c936a 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el @@ -4,7 +4,7 @@ ;; Author: Ulf Jasper ;; Filename: newsticker.el -;; URL: http://www.nongnu.org/newsticker +;; URL: https://www.nongnu.org/newsticker ;; Created: 17. June 2003 ;; Keywords: News, RSS, Atom diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 7f147fa0de..ed7d7e53a9 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -55,7 +55,7 @@ ;; ;; (("GNU" . "https://www.gnu.org/") ;; ("FSF" "https://www.fsf.org/" "The Free Software Foundation") -;; ("emacs" . "http://www.emacs.org/") +;; ("emacs" . "https://www.emacs.org/") ;; ("davep" "http://www.davep.org/" "Dave's homepage")) ;; ;; In case you're wondering about the mixture of cons cells and lists, diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el index 8bf25151df..bd0f82cbad 100644 --- a/lisp/net/tramp-archive.el +++ b/lisp/net/tramp-archive.el @@ -103,7 +103,7 @@ ;; It is even possible to access file archives in file archives, as ;; (find-file -;; "http://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control") +;; "https://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control") ;;; Code: diff --git a/lisp/org/org.el b/lisp/org/org.el index 1a13754619..df79d57f2c 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -693,7 +693,7 @@ defined in org-duration.el.") If a description starts with , the file is not part of Emacs and Org mode, so loading it will require that you have properly installed org-contrib package from NonGNU Emacs Lisp Package Archive -http://elpa.nongnu.org/nongnu/org-contrib.html +https://elpa.nongnu.org/nongnu/org-contrib.html You can also use this system to load external packages (i.e. neither Org core modules, nor org-contrib modules). Just add symbols @@ -773,7 +773,7 @@ For export specific modules, see also `org-export-backends'." If a description starts with , the file is not part of Emacs and Org mode, so loading it will require that you have properly installed org-contrib package from NonGNU Emacs Lisp Package Archive -http://elpa.nongnu.org/nongnu/org-contrib.html +https://elpa.nongnu.org/nongnu/org-contrib.html Unlike to `org-modules', libraries in this list will not be loaded along with Org, but only once the export framework is commit 6b8957852476e4ba31873424aa8f81d9e55bc34c Author: Eli Zaretskii Date: Thu Dec 9 17:01:57 2021 +0200 ; * lisp/progmodes/flymake.el: Update the minimum Emacs version. diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 4f9506c98b..72199b33a4 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -6,7 +6,7 @@ ;; Maintainer: João Távora ;; Version: 1.2.1 ;; Keywords: c languages tools -;; Package-Requires: ((emacs "26.1") (eldoc "1.1.0") (project "0.7.1")) +;; Package-Requires: ((emacs "28.1") (eldoc "1.1.0") (project "0.7.1")) ;; This is a GNU ELPA :core package. Avoid functionality that is not ;; compatible with the version of Emacs recorded above. commit 6ecb24f877242371a0dbc7938e9b408df2690dc7 Merge: 24e9616a0f 1821844357 Author: Stefan Kangas Date: Thu Dec 9 14:53:51 2021 +0100 Merge from origin/emacs-28 1821844357 Add missing K key documentation for Cangjie input methods be860c1385 Fix manual entry of 'quit-restore-window' (Bug#52328) 35a96139df Clarify a comment in xdisp.c 6ba2f028cf Revert "Grep alias `all' shall not match parent directory" eb9e33e238 ; * etc/NEWS: Non-nil repeat-keep-prefix is not the defaul... 538fc1d0e0 Fix mode-line display in Calendar mode # Conflicts: # etc/NEWS # lisp/help.el commit 24e9616a0fefd1b3b60086eb6c88c15409ff42f7 Merge: 948a8936ba c8c7822c51 Author: Stefan Kangas Date: Thu Dec 9 14:52:46 2021 +0100 ; Merge from origin/emacs-28 The following commit was skipped: c8c7822c51 * etc/tutorials/TUTORIAL.it (CONCLUSIONI): Reword paragraph. commit 1821844357e60eccbc269fb9455579061a6f30b2 Author: Cameron Desautels Date: Thu Dec 9 00:08:14 2021 -0800 Add missing K key documentation for Cangjie input methods * lisp/international/titdic-cnv.el (tsang-quick-converter): Add the missing K key in input method documentation. (Bug#52264) diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index dfd4e5b829..4ac0100746 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -748,7 +748,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." [Q 手] [W 田] [E 水] [R 口] [T 廿] [Y 卜] [U 山] [I 戈] [O 人] [P 心] - [A 日] [S 尸] [D 木] [F 火] [G 土] [H 竹] [J 十] [L 中] + [A 日] [S 尸] [D 木] [F 火] [G 土] [H 竹] [J 十] [K 大] [L 中] [Z ] [X 難] [C 金] [V 女] [B 月] [N 弓] [M 一] commit 948a8936ba26c7823f716bb1041ee3f309bb9ece Author: Po Lu Date: Thu Dec 9 17:57:25 2021 +0800 Make precision scrolling up work over display strings * lisp/pixel-scroll.el (pixel-point-and-height-at-unseen-line): Use `window-text-pixel-size'. (pixel-scroll-precision-scroll-up-page): Use delta as vscroll directly. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index 66aa480b70..ead841c982 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -406,7 +406,9 @@ window, and the pixel height of that line." (if (bobp) (point-min) (vertical-motion -1) - (setq line-height (line-pixel-height)) + (setq line-height + (cdr (window-text-pixel-size nil (point) + pos0))) (point))))) ;; restore initial position (set-window-start nil pos0 t) @@ -530,21 +532,7 @@ the height of the current window." (goto-char (car position))) (setq delta (- delta (cdr position))))) (when (< delta 0) - (if-let* ((desired-pos (posn-at-x-y 0 (+ (- delta) - (window-tab-line-height) - (window-header-line-height)))) - (desired-start (posn-point desired-pos)) - (desired-vscroll (cdr (posn-object-x-y desired-pos)))) - (progn - (set-window-start nil (if (zerop (window-hscroll)) - desired-start - (save-excursion - (goto-char desired-start) - (beginning-of-visual-line) - (point))) - t) - (set-window-vscroll nil desired-vscroll t)) - (set-window-vscroll nil (abs delta) t))))))) + (set-window-vscroll nil (- delta) t)))))) (defun pixel-scroll-precision-interpolate (delta) "Interpolate a scroll of DELTA pixels. commit 07d95325e4bb955c4b660f632c77c4693374282f Author: Po Lu Date: Thu Dec 9 17:40:08 2021 +0800 Fix pixel scrolling over lines with different sized glyphs * lisp/pixel-scroll.el (pixel-scroll-precision-scroll-down-page): Calculate desired vscroll with `window-text-pixel-size'. diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index f21cdaed3d..66aa480b70 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -436,7 +436,10 @@ the height of the current window." (window-header-line-height)))) (object (posn-object desired-pos)) (desired-start (posn-point desired-pos)) - (desired-vscroll (cdr (posn-object-x-y desired-pos))) + (scroll-area-total-height (cdr (window-text-pixel-size nil + (window-start) + (1- desired-start)))) + (desired-vscroll (- delta scroll-area-total-height)) (edges (window-edges nil t)) (usable-height (- (nth 3 edges) (nth 1 edges))) commit be860c1385afaf3dec6edf8872448a3349ad716f Author: Martin Rudalics Date: Thu Dec 9 10:00:51 2021 +0100 Fix manual entry of 'quit-restore-window' (Bug#52328) * doc/lispref/windows.texi (Quitting Windows): Fix bug in description of 'quit-restore-window' (Bug#52328). diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index a3a37bc60d..54a5bce96c 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -4262,12 +4262,12 @@ deleted unconditionally. Otherwise, the fate of the frame is determined by calling @code{frame-auto-hide-function} (see below) with that frame as sole argument. -If the third element of the @code{quit-restore} parameter is a list of -buffer, window start (@pxref{Window Start and End}), and point -(@pxref{Window Point}), and that buffer is still live, the buffer will -be displayed, and start and point set accordingly. If, in addition, -@var{window}'s buffer was temporarily resized, this function will also -try to restore the original height of @var{window}. +If the second element of the @code{quit-restore} parameter is a list +of a buffer, a window start (@pxref{Window Start and End}) and a +window point (@pxref{Window Point}), and that buffer is still live, +the buffer will be displayed, and start and point set accordingly. +If, in addition, @var{window}'s buffer was temporarily resized, this +function will also try to restore the original height of @var{window}. Otherwise, if @var{window} was previously used for displaying other buffers (@pxref{Window History}), the most recent buffer in that commit 35a96139df1f4f4a826bdb89fd0c89e1e64ec20b Author: Eli Zaretskii Date: Thu Dec 9 09:18:04 2021 +0200 Clarify a comment in xdisp.c * src/xdisp.c (compute_window_start_on_continuation_line): Clarify a comment. (Bug#52378) diff --git a/src/xdisp.c b/src/xdisp.c index 527a79b38d..5d687e1c29 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -17798,10 +17798,11 @@ compute_window_start_on_continuation_line (struct window *w) row, DEFAULT_FACE_ID); reseat_at_previous_visible_line_start (&it); - /* If the line start is "too far" away from the window start, - say it takes too much time to compute a new window start. - Also, give up if the line start is after point, as in that - case point will not be visible with any window start we + /* Give up (by not using the code in the block below) and say it + takes too much time to compute a new window start, if the + line start is "too far" away from the window start. Also, + give up if the line start is after point, as in that case + point will not be visible with any window start we compute. */ if (IT_CHARPOS (it) <= PT || (CHARPOS (start_pos) - IT_CHARPOS (it) commit 6ba2f028cfa8f6a3a0deb399e9826d91bd724390 Author: Óscar Fuentes Date: Wed Dec 8 23:49:26 2021 +0100 Revert "Grep alias `all' shall not match parent directory" This reverts commit 856cd948d1a5a016ad36721246a049d33451902f. Emacs got better at quoting shell arguments and the original value works correctly for vc-git-grep. At the same time, the value introduced on that commit caused a regression on lgrep. * lisp/progmodes/grep.el (grep-files-aliases): Use previous value for `all'. Fixes bug#52367 diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index ec2850737c..9be3af79f9 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -203,7 +203,7 @@ by `grep-compute-defaults'; to change the default value, use :version "22.1") (defcustom grep-files-aliases - '(("all" . "* .[!.]* ..?*") ;; Don't match `..'. See bug#22577 + '(("all" . "* .*") ("el" . "*.el") ("ch" . "*.[ch]") ("c" . "*.c") commit eb9e33e2386e6315b9b312d08e8ebc715647caf4 Author: Juri Linkov Date: Wed Dec 8 22:20:41 2021 +0200 ; * etc/NEWS: Non-nil repeat-keep-prefix is not the default anymore. diff --git a/etc/NEWS b/etc/NEWS index 734de07582..eb65213ac2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3275,11 +3275,11 @@ The user option 'repeat-exit-timeout' (default nil, which means forever) specifies the number of seconds of idle time after which to break the repetition chain automatically. -When user option 'repeat-keep-prefix' is non-nil (the default), the -prefix arg of the previous command is kept. This can be used to -e.g. reverse the window navigation direction with 'C-x o M-- o o' or -to set a new step with 'C-x { C-5 { { {', which will set the window -resizing step to 5 columns. +When user option 'repeat-keep-prefix' is non-nil, the prefix arg of +the previous command is kept. This can be used to e.g. reverse the +window navigation direction with 'C-x o M-- o o' or to set a new step +with 'C-x { C-5 { { {', which will set the window resizing step to 5 +columns. 'M-x describe-repeat-maps' will display a buffer showing which commands are repeatable in 'repeat-mode'. commit 538fc1d0e07aed0e535d9e9f2063f429238df422 Author: Eli Zaretskii Date: Wed Dec 8 16:22:10 2021 +0200 Fix mode-line display in Calendar mode * lisp/help.el (substitute-command-keys): New optional argument NO-FACE, to avoid putting the 'help-key-binding' face on the key bindings. * lisp/calendar/calendar.el (calendar-mode-line-entry): Call 'substitute-command-keys' with the new optional argument non-nil. (Bug#52366) * doc/lispref/help.texi (Keys in Documentation): Document the new optional argument of 'substitute-command-keys'. * etc/NEWS: Announce the addition of a new argument to 'substitute-command-keys'. diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index a788852de7..a48571838c 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -372,11 +372,15 @@ quotes. You can customize it freely according to your personal preference. @end defopt -@defun substitute-command-keys string +@defun substitute-command-keys string &optional no-face +@vindex help-key-binding@r{ (face)} This function scans @var{string} for the above special sequences and replaces them by what they stand for, returning the result as a string. This permits display of documentation that refers accurately to the -user's own customized key bindings. +user's own customized key bindings. By default, the key bindings are +given a special face @code{help-key-binding}, but if the optional +argument @var{no-face} is non-@code{nil}, the function doesn't add +this face to the produced string. @cindex advertised binding If a command has multiple bindings, this function normally uses the diff --git a/etc/NEWS b/etc/NEWS index 8e38c3690c..734de07582 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -635,7 +635,9 @@ This works like 'C-u M-x apropos-command' but is more discoverable. *** Keybindings in 'help-mode' use the new 'help-key-binding' face. This face is added by 'substitute-command-keys' to any "\[command]" substitution. The return value of that function should consequently -be assumed to be a propertized string. +be assumed to be a propertized string. To prevent the function from +adding the 'help-key-binding' face, call 'substitute-command-keys' +with the new optional argument NO-FACE non-nil. Note that the new face will also be used in tooltips. When using the GTK toolkit, this is only true if 'x-gtk-use-system-tooltips' is t. diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index ebce2ae3dd..e06239a5c8 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1723,7 +1723,8 @@ COMMAND is a command to run, ECHO is the help-echo text, KEY is COMMAND's keybinding, STRING describes the binding." (propertize (or key (substitute-command-keys - (format "\\\\[%s] %s" command string))) + (format "\\\\[%s] %s" command string) + 'hands-off-my-face)) 'help-echo (format "mouse-1: %s" echo) 'mouse-face 'mode-line-highlight 'keymap (make-mode-line-mouse-map 'mouse-1 command))) diff --git a/lisp/help.el b/lisp/help.el index 47faf44b37..941d4cfab1 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1060,11 +1060,12 @@ is currently activated with completion." result)) -(defun substitute-command-keys (string) +(defun substitute-command-keys (string &optional no-face) "Substitute key descriptions for command names in STRING. Each substring of the form \\\\=[COMMAND] is replaced by either a keystroke sequence that invokes COMMAND, or \"M-x COMMAND\" if COMMAND -is not on any keys. Keybindings will use the face `help-key-binding'. +is not on any keys. Keybindings will use the face `help-key-binding', +unless the optional argument NO-FACE is non-nil. Each substring of the form \\\\={MAPVAR} is replaced by a summary of the value of MAPVAR as a keymap. This summary is similar to the one @@ -1141,13 +1142,17 @@ Otherwise, return a new string." (let ((op (point))) (insert "M-x ") (goto-char (+ end-point 3)) - (add-text-properties op (point) - '( face help-key-binding - font-lock-face help-key-binding)) + (or no-face + (add-text-properties + op (point) + '( face help-key-binding + font-lock-face help-key-binding))) (delete-char 1)) ;; Function is on a key. (delete-char (- end-point (point))) - (insert (help--key-description-fontified key))))) + (insert (if no-face + (key-description key) + (help--key-description-fontified key)))))) ;; 1D. \{foo} is replaced with a summary of the keymap ;; (symbol-value foo). ;; \ just sets the keymap used for \[cmd]. commit c8c7822c51325ed300c0ffb91ce42e1868c6bda4 Author: Lele Gaifax Date: Wed Dec 8 09:00:19 2021 +0100 * etc/tutorials/TUTORIAL.it (CONCLUSIONI): Reword paragraph. Don't merge to master. diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it index 68bf40332e..cd5c6de9db 100644 --- a/etc/tutorials/TUTORIAL.it +++ b/etc/tutorials/TUTORIAL.it @@ -1183,9 +1183,9 @@ Il manuale descrive molte altre funzionalità di Emacs. Per chiudere una sessione di Emacs si usa C-x C-c. -Questo documento è stato creato per essere utile a tutti i nuovi -utenti, se qualcosa per te è stato poco chiaro non dare la colpa a te -stesso: lamentati! +Questo documento è pensato per essere comprensibile a tutti i nuovi +utenti, quindi se hai trovato qualcosa di poco chiaro, non dare la +colpa a te stesso: lamentati! * COPIA