commit d037a6a2e6f92d793b1d5403dea4c7d3ca70883c (HEAD, refs/remotes/origin/master) Author: Lars Ingebrigtsen Date: Fri Oct 2 08:07:53 2020 +0200 Fix electric-buffer-list buffer selection * lisp/ebuff-menu.el (electric-buffer-list): Ensure that point is restored, which isn't always the case if global-display-line-numbers-mode (bug#43755). This enables selecting buffers again. diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index 7285021676..079fce88de 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -162,6 +162,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. (message ""))) (when select (set-buffer buffer) + (goto-char select) (let ((opoint (point-marker))) (Buffer-menu-execute) (goto-char (point-min)) commit f6277911eb2c520aec8f0efd80c91999226e3322 Author: Dmitry Gutov Date: Fri Oct 2 07:11:56 2020 +0200 Make xref work better on variables in shell-script-mode * lisp/progmodes/sh-script.el (sh-mode-syntax-table): Classify "/" as punctuation so that `M-.' on $foo/bar works on the $foo part (bug#25585). diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 3c249b7bc0..a8c0e045c6 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -386,6 +386,7 @@ name symbol." ?~ "_" ?, "_" ?= "." + ?/ "." ?\; "." ?| "." ?& "." commit 3f5f3dd60411fb09a31ef49abf128543d60cbbdd Author: Lars Ingebrigtsen Date: Fri Oct 2 05:30:37 2020 +0200 Make `C-c C-e' in Python buffers work * lisp/progmodes/python.el (python-shell-send-statement): Don't send a cookie, because that leads to the naked expression not being evaled (bug#43450). (python-shell-send-region): Allow not sending a cookie. (python-shell-buffer-substring): Ditto. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 3bdf46ddc4..3121e5a079 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -3074,7 +3074,7 @@ Returns the output. See `python-shell-send-string-no-output'." (define-obsolete-function-alias 'python-send-string 'python-shell-internal-send-string "24.3") -(defun python-shell-buffer-substring (start end &optional nomain) +(defun python-shell-buffer-substring (start end &optional nomain no-cookie) "Send buffer substring from START to END formatted for shell. This is a wrapper over `buffer-substring' that takes care of different transformations for the code sent to be evaluated in @@ -3100,12 +3100,13 @@ the python shell: (goto-char start) (python-util-forward-comment 1) (current-indentation)))) - (fillstr (when (not starts-at-point-min-p) - (concat - (format "# -*- coding: %s -*-\n" encoding) - (make-string - ;; Subtract 2 because of the coding cookie. - (- (line-number-at-pos start) 2) ?\n))))) + (fillstr (and (not no-cookie) + (not starts-at-point-min-p) + (concat + (format "# -*- coding: %s -*-\n" encoding) + (make-string + ;; Subtract 2 because of the coding cookie. + (- (line-number-at-pos start) 2) ?\n))))) (with-temp-buffer (python-mode) (when fillstr @@ -3144,7 +3145,8 @@ the python shell: (line-beginning-position) (line-end-position)))) (buffer-substring-no-properties (point-min) (point-max))))) -(defun python-shell-send-region (start end &optional send-main msg) +(defun python-shell-send-region (start end &optional send-main msg + no-cookie) "Send the region delimited by START and END to inferior Python process. When optional argument SEND-MAIN is non-nil, allow execution of code inside blocks delimited by \"if __name__== \\='__main__\\=':\". @@ -3154,7 +3156,8 @@ non-nil, forces display of a user-friendly message if there's no process running; defaults to t when called interactively." (interactive (list (region-beginning) (region-end) current-prefix-arg t)) - (let* ((string (python-shell-buffer-substring start end (not send-main))) + (let* ((string (python-shell-buffer-substring start end (not send-main) + no-cookie)) (process (python-shell-get-process-or-error msg)) (original-string (buffer-substring-no-properties start end)) (_ (string-match "\\`\n*\\(.*\\)" original-string))) @@ -3178,7 +3181,7 @@ interactively." (python-shell-send-region (save-excursion (python-nav-beginning-of-statement)) (save-excursion (python-nav-end-of-statement)) - send-main msg))) + send-main msg t))) (defun python-shell-send-buffer (&optional send-main msg) "Send the entire buffer to inferior Python process. commit aac3effb8f3f870fc861eb62c67a8cb989cf74ac Author: Per Starbäck Date: Fri Oct 2 05:11:06 2020 +0200 python-shell-send-defun doesn't find the (whole) definition * lisp/progmodes/python.el (python-shell-send-defun): Fix C-M-x for definitions like @property\ndef bar(): (bug#37828). diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 95b6a037bb..3bdf46ddc4 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -3200,27 +3200,29 @@ optional argument MSG is non-nil, forces display of a user-friendly message if there's no process running; defaults to t when called interactively." (interactive (list current-prefix-arg t)) - (save-excursion - (python-shell-send-region - (progn - (end-of-line 1) - (while (and (or (python-nav-beginning-of-defun) - (beginning-of-line 1)) - (> (current-indentation) 0))) - (when (not arg) - (while (and - (eq (forward-line -1) 0) - (if (looking-at (python-rx decorator)) - t - (forward-line 1) - nil)))) - (point-marker)) - (progn - (or (python-nav-end-of-defun) - (end-of-line 1)) - (point-marker)) - nil ;; noop - msg))) + (let ((starting-pos (point))) + (save-excursion + (python-shell-send-region + (progn + (end-of-line 1) + (while (and (or (python-nav-beginning-of-defun) + (beginning-of-line 1)) + (> (current-indentation) 0))) + (when (not arg) + (while (and + (eq (forward-line -1) 0) + (if (looking-at (python-rx decorator)) + t + (forward-line 1) + nil)))) + (point-marker)) + (progn + (goto-char starting-pos) + (or (python-nav-end-of-defun) + (end-of-line 1)) + (point-marker)) + nil ;; noop + msg)))) (defun python-shell-send-file (file-name &optional process temp-file-name delete msg) commit acfbacefc468244911455fe6cd2abeabfddff312 Author: Robert Pluim Date: Fri Oct 2 04:49:39 2020 +0200 Make setting verify-hostname-error not make connections fail * lisp/net/gnutls.el (gnutls-boot-parameters): If verify-hostname-error was set, this would make verify-error a non-proper list (bug#38602). diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index e713c94117..8ad721964d 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -348,8 +348,11 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT." (t nil)))) (min-prime-bits (or min-prime-bits gnutls-min-prime-bits))) - (when verify-hostname-error - (push :hostname verify-error)) + ;; Only add :hostname if `verify-error' is not t, since t + ;; means "include :hostname" Bug#38602. + (and verify-hostname-error + (not (eq verify-error t)) + (push :hostname verify-error)) `(:priority ,priority-string :hostname ,hostname commit 6f36b67e4146ef4610916b7903fd292e1308daf5 Author: Lars Ingebrigtsen Date: Fri Oct 2 04:34:31 2020 +0200 Stop using a dynamically bound 'generated-autoload-file' variable * doc/lispref/loading.texi (Autoload): Document change of name (bug#39823). * lisp/emacs-lisp/autoload.el (autoload-find-generated-file): Pass the file name in. (autoload-generated-file): Ditto. (autoload-file-load-name): Ditto. (generate-file-autoloads): Ditto. (autoload--setup-output): Ditto. (autoload-generate-file-autoloads): Ditto, and alter doc string to reflect when `generated-autoload-file' is heeded. (update-file-autoloads): Pass outfile in to functions. (autoload-find-destination): Ditto. (update-directory-autoloads): Make into an obsolete shim around `make-directory-autoloads'. (make-directory-autoloads): Renamed from `update-directory-autoloads' with new semantics. (batch-update-autoloads): Adjust caller. * lisp/emacs-lisp/package.el (package-generate-autoloads): Adjust caller. diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 6833af9c26..aa6ef307b1 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -577,7 +577,7 @@ macro, then an error is signaled with data @code{"Autoloading failed to define function @var{function-name}"}. @findex update-file-autoloads -@findex update-directory-autoloads +@findex make-directory-autoloads @cindex magic autoload comment @cindex autoload cookie @anchor{autoload cookie} @@ -590,7 +590,7 @@ writes a corresponding @code{autoload} call into @file{loaddefs.el}. file generated by @code{update-file-autoloads} can be changed from the above defaults, see below.) Building Emacs loads @file{loaddefs.el} and thus calls @code{autoload}. -@kbd{M-x update-directory-autoloads} is even more powerful; it updates +@kbd{M-x make-directory-autoloads} is even more powerful; it updates autoloads for all files in the current directory. The same magic comment can copy any kind of form into diff --git a/etc/NEWS b/etc/NEWS index 3a176f22af..d5b1496bba 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1469,6 +1469,13 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el. * Lisp Changes in Emacs 28.1 ++++ +*** New command 'make-directory-autoloads'. +This does the same as the old command 'update-directory-autoloads', +but has different semantics: Instead of passing in the output file via +the dynamically bound 'generated-autoload-file' variable, the output +file is now a explicit parameter. + +++ *** New function 'string-search'. This function takes two string parameters and returns the position of diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 0bcd7b7dcd..e6e3fd9da1 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -254,13 +254,12 @@ expression, in which case we want to handle forms differently." ;; the doc-string in FORM. ;; Those properties are now set in lisp-mode.el. -(defun autoload-find-generated-file () +(defun autoload-find-generated-file (file) "Visit the autoload file for the current buffer, and return its buffer." (let ((enable-local-variables :safe) (enable-local-eval nil) (find-file-hook nil) - (delay-mode-hooks t) - (file (autoload-generated-file))) + (delay-mode-hooks t)) ;; We used to use `raw-text' to read this file, but this causes ;; problems when the file contains non-ASCII characters. (with-current-buffer (find-file-noselect @@ -268,18 +267,20 @@ expression, in which case we want to handle forms differently." (if (zerop (buffer-size)) (insert (autoload-rubric file nil t))) (current-buffer)))) -(defun autoload-generated-file () - "Return `generated-autoload-file' as an absolute name. -If local to the current buffer, expand using the default directory; -otherwise, using `source-directory'/lisp." - (expand-file-name generated-autoload-file +(defun autoload-generated-file (outfile) + "Return OUTFILE as an absolute name. +If `generated-autoload-file' is bound locally in the current +buffer, that is used instead, and it is expanded using the +default directory; otherwise, `source-directory'/lisp is used." + (expand-file-name (if (local-variable-p 'generated-autoload-file) + generated-autoload-file + outfile) ;; File-local settings of generated-autoload-file should ;; be interpreted relative to the file's location, ;; of course. (if (not (local-variable-p 'generated-autoload-file)) (expand-file-name "lisp" source-directory)))) - (defun autoload-read-section-header () "Read a section header form. Since continuation lines have been marked as comments, @@ -454,13 +455,12 @@ which lists the file name and which functions are in it, etc." (defvar no-update-autoloads nil "File local variable to prevent scanning this file for autoload cookies.") -(defun autoload-file-load-name (file) +(defun autoload-file-load-name (file outfile) "Compute the name that will be used to load FILE." ;; OUTFILE should be the name of the global loaddefs.el file, which ;; is expected to be at the root directory of the files we're ;; scanning for autoloads and will be in the `load-path'. - (let* ((outfile (default-value 'generated-autoload-file)) - (name (file-relative-name file (file-name-directory outfile))) + (let* ((name (file-relative-name file (file-name-directory outfile))) (names '()) (dir (file-name-directory outfile))) ;; If `name' has directory components, only keep the @@ -490,8 +490,9 @@ If FILE is being visited in a buffer, the contents of the buffer are used. Return non-nil in the case where no autoloads were added at point." (interactive "fGenerate autoloads for file: ") - (let ((generated-autoload-file buffer-file-name)) - (autoload-generate-file-autoloads file (current-buffer)))) + (let ((autoload-modified-buffers nil)) + (autoload-generate-file-autoloads file (current-buffer) buffer-file-name) + autoload-modified-buffers)) (defvar autoload-compute-prefixes t "If non-nil, autoload will add code to register the prefixes used in a file. @@ -608,7 +609,7 @@ Don't try to split prefixes that are already longer than that.") `(register-definition-prefixes ,file ',(sort (delq nil strings) 'string<)))))) -(defun autoload--setup-output (otherbuf outbuf absfile load-name) +(defun autoload--setup-output (otherbuf outbuf absfile load-name output-file) (let ((outbuf (or (if otherbuf ;; A file-local setting of @@ -616,7 +617,7 @@ Don't try to split prefixes that are already longer than that.") ;; should ignore OUTBUF. nil outbuf) - (autoload-find-destination absfile load-name) + (autoload-find-destination absfile load-name output-file) ;; The file has autoload cookies, but they're ;; already up-to-date. If OUTFILE is nil, the ;; entries are in the expected OUTBUF, @@ -673,23 +674,16 @@ Don't try to split prefixes that are already longer than that.") More specifically those definitions will not be considered for the `register-definition-prefixes' call.") -;; When called from `generate-file-autoloads' we should ignore -;; `generated-autoload-file' altogether. When called from -;; `update-file-autoloads' we don't know `outbuf'. And when called from -;; `update-directory-autoloads' it's in between: we know the default -;; `outbuf' but we should obey any file-local setting of -;; `generated-autoload-file'. (defun autoload-generate-file-autoloads (file &optional outbuf outfile) "Insert an autoload section for FILE in the appropriate buffer. Autoloads are generated for defuns and defmacros in FILE marked by `generate-autoload-cookie' (which see). + If FILE is being visited in a buffer, the contents of the buffer are used. OUTBUF is the buffer in which the autoload statements should be inserted. -If OUTBUF is nil, it will be determined by `autoload-generated-file'. -If provided, OUTFILE is expected to be the file name of OUTBUF. -If OUTFILE is non-nil and FILE specifies a `generated-autoload-file' -different from OUTFILE, then OUTBUF is ignored. +If OUTBUF is nil, the output will go to OUTFILE, unless there's a +buffer-local setting of `generated-autoload-file' in FILE. Return non-nil if and only if FILE adds no autoloads to OUTFILE \(or OUTBUF if OUTFILE is nil). The actual return value is @@ -717,16 +711,19 @@ FILE's modification time." (setq load-name (if (stringp generated-autoload-load-name) generated-autoload-load-name - (autoload-file-load-name absfile))) + (autoload-file-load-name absfile outfile))) ;; FIXME? Comparing file-names for equality with just equal ;; is fragile, eg if one has an automounter prefix and one ;; does not, but both refer to the same physical file. (when (and outfile + (not outbuf) (not (if (memq system-type '(ms-dos windows-nt)) (equal (downcase outfile) - (downcase (autoload-generated-file))) - (equal outfile (autoload-generated-file))))) + (downcase (autoload-generated-file + outfile))) + (equal outfile (autoload-generated-file + outfile))))) (setq otherbuf t)) (save-excursion (save-restriction @@ -740,7 +737,8 @@ FILE's modification time." (file-name-sans-extension (file-name-nondirectory file)))) (setq output-start (autoload--setup-output - otherbuf outbuf absfile load-name)) + otherbuf outbuf absfile + load-name outfile)) (let ((standard-output (marker-buffer output-start)) (print-quoted t)) (princ `(push (purecopy @@ -758,7 +756,8 @@ FILE's modification time." ;; If not done yet, figure out where to insert this text. (unless output-start (setq output-start (autoload--setup-output - otherbuf outbuf absfile load-name))) + otherbuf outbuf absfile + load-name outfile))) (autoload--print-cookie-text output-start load-name file)) ((= (following-char) ?\;) ;; Don't read the comment. @@ -789,7 +788,7 @@ FILE's modification time." ((not otherbuf) (unless output-start (setq output-start (autoload--setup-output - nil outbuf absfile load-name))) + nil outbuf absfile load-name outfile))) (let ((autoload-print-form-outbuf (marker-buffer output-start))) (autoload-print-form form))) @@ -801,9 +800,8 @@ FILE's modification time." ;; then passing otherbuf=nil is enough, but if ;; outbuf is nil, that won't cut it, so we ;; locally bind generated-autoload-file. - (let ((generated-autoload-file - (default-value 'generated-autoload-file))) - (autoload--setup-output nil outbuf absfile load-name))) + (autoload--setup-output nil outbuf absfile load-name + outfile)) (autoload-print-form-outbuf (marker-buffer other-output-start))) (autoload-print-form form) @@ -925,19 +923,22 @@ Return FILE if there was no autoload cookie in it, else nil." (interactive (list (read-file-name "Update autoloads for file: ") current-prefix-arg (read-file-name "Write autoload definitions to file: "))) - (let* ((generated-autoload-file (or outfile generated-autoload-file)) - (autoload-modified-buffers nil) + (let* ((autoload-modified-buffers nil) ;; We need this only if the output file handles more than one input. ;; See https://debbugs.gnu.org/22213#38 and subsequent. (autoload-timestamps t) - (no-autoloads (autoload-generate-file-autoloads file))) + (no-autoloads (autoload-generate-file-autoloads + file nil + (if (local-variable-p 'generated-autoload-file) + generated-autoload-file + outfile)))) (if autoload-modified-buffers (if save-after (autoload-save-buffers)) (if (called-interactively-p 'interactive) (message "Autoload section for %s is up to date." file))) (if no-autoloads file))) -(defun autoload-find-destination (file load-name) +(defun autoload-find-destination (file load-name output-file) "Find the destination point of the current buffer's autoloads. FILE is the file name of the current buffer. LOAD-NAME is the name as it appears in the output. @@ -947,12 +948,12 @@ removes any prior now out-of-date autoload entries." (catch 'up-to-date (let* ((buf (current-buffer)) (existing-buffer (if buffer-file-name buf)) - (output-file (autoload-generated-file)) + (output-file (autoload-generated-file output-file)) (output-time (if (file-exists-p output-file) (file-attribute-modification-time (file-attributes output-file)))) (found nil)) - (with-current-buffer (autoload-find-generated-file) + (with-current-buffer (autoload-find-generated-file output-file) ;; This is to make generated-autoload-file have Unix EOLs, so ;; that it is portable to all platforms. (or (eq 0 (coding-system-eol-type buffer-file-coding-system)) @@ -1033,12 +1034,31 @@ The function does NOT recursively descend into subdirectories of the directory or directories specified. In an interactive call, prompt for a default output file for the -autoload definitions, and temporarily bind the variable -`generated-autoload-file' to this value. When called from Lisp, -use the existing value of `generated-autoload-file'. If any Lisp -file binds `generated-autoload-file' as a file-local variable, -write its autoloads into the specified file instead." +autoload definitions. When called from Lisp, use the existing +value of `generated-autoload-file'. If any Lisp file binds +`generated-autoload-file' as a file-local variable, write its +autoloads into the specified file instead." + (declare (obsolete make-directory-autoloads "28.1")) (interactive "DUpdate autoloads from directory: ") + (make-directory-autoloads + dirs + (if (called-interactively-p 'interactive) + (read-file-name "Write autoload definitions to file: ") + generated-autoload-file))) + +;;;###autoload +(defun make-directory-autoloads (dir output-file) + "Update autoload definitions for Lisp files in the directories DIRS. +DIR can be either a single directory or a list of +directories. (The latter usage is discouraged.) + +The autoloads will be written to OUTPUT-FILE. If any Lisp file +binds `generated-autoload-file' as a file-local variable, write +its autoloads into the specified file instead. + +The function does NOT recursively descend into subdirectories of the +directory or directories specified." + (interactive "DUpdate autoloads from directory: \nFWrite to file: ") (let* ((files-re (let ((tmp nil)) (dolist (suf (get-load-suffixes)) ;; We don't use module-file-suffix below because @@ -1049,10 +1069,10 @@ write its autoloads into the specified file instead." (push suf tmp))) (concat "\\`[^=.].*" (regexp-opt tmp t) "\\'"))) (files (apply #'nconc - (mapcar (lambda (dir) - (directory-files (expand-file-name dir) - t files-re)) - dirs))) + (mapcar (lambda (d) + (directory-files (expand-file-name d) + t files-re)) + (if (consp dir) dir (list dir))))) (done ()) ;Files processed; to remove duplicates. (changed nil) ;Non-nil if some change occurred. (last-time) @@ -1060,16 +1080,12 @@ write its autoloads into the specified file instead." ;; files because of file-local autoload-generated-file settings. (no-autoloads nil) (autoload-modified-buffers nil) - (generated-autoload-file - (if (called-interactively-p 'interactive) - (read-file-name "Write autoload definitions to file: ") - generated-autoload-file)) (output-time - (if (file-exists-p generated-autoload-file) - (file-attribute-modification-time - (file-attributes generated-autoload-file))))) + (and (file-exists-p output-file) + (file-attribute-modification-time + (file-attributes output-file))))) - (with-current-buffer (autoload-find-generated-file) + (with-current-buffer (autoload-find-generated-file output-file) (save-excursion ;; Canonicalize file names and remove the autoload file itself. (setq files (delete (file-relative-name buffer-file-name) @@ -1126,8 +1142,7 @@ write its autoloads into the specified file instead." (progress (make-progress-reporter (byte-compile-info (concat "Scraping files for " - (file-relative-name - generated-autoload-file))) + (file-relative-name output-file))) 0 (length files) nil 10)) (file-count 0) file-time) @@ -1205,7 +1220,7 @@ should be non-nil)." (let ((args command-line-args-left)) (batch-update-autoloads--summary args) (setq command-line-args-left nil) - (apply #'update-directory-autoloads args))) + (make-directory-autoloads args generated-autoload-file))) (provide 'autoload) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index a173fc060a..e77077fc52 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1013,7 +1013,6 @@ untar into a directory named DIR; otherwise, signal an error." (write-region (autoload-rubric file "package" nil) nil file nil 'silent)) file) -(defvar generated-autoload-file) (defvar autoload-timestamps) (defvar version-control) @@ -1021,14 +1020,14 @@ untar into a directory named DIR; otherwise, signal an error." "Generate autoloads in PKG-DIR for package named NAME." (let* ((auto-name (format "%s-autoloads.el" name)) ;;(ignore-name (concat name "-pkg.el")) - (generated-autoload-file (expand-file-name auto-name pkg-dir)) + (output-file (expand-file-name auto-name pkg-dir)) ;; We don't need 'em, and this makes the output reproducible. (autoload-timestamps nil) (backup-inhibited t) (version-control 'never)) - (package-autoload-ensure-default-file generated-autoload-file) - (update-directory-autoloads pkg-dir) - (let ((buf (find-buffer-visiting generated-autoload-file))) + (package-autoload-ensure-default-file output-file) + (make-directory-autoloads pkg-dir output-file) + (let ((buf (find-buffer-visiting output-file))) (when buf (kill-buffer buf))) auto-name)) diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el index b68a694512..408d6e8e23 100644 --- a/test/lisp/vc/vc-bzr-tests.el +++ b/test/lisp/vc/vc-bzr-tests.el @@ -131,7 +131,6 @@ (make-directory bzrdir) (expand-file-name "foo.el" bzrdir))) (default-directory (file-name-as-directory bzrdir)) - (generated-autoload-file (expand-file-name "loaddefs.el" bzrdir)) (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect @@ -148,7 +147,9 @@ ;; causes bzr status to fail. This simulates a broken bzr ;; installation. (delete-file ".bzr/checkout/dirstate") - (should (progn (update-directory-autoloads default-directory) + (should (progn (make-directory-autoloads + default-directory + (expand-file-name "loaddefs.el" bzrdir)) t))) (delete-directory homedir t)))) commit fef7704febce3c63edc64a905803c78e7363046c Author: Shohei YOSHIDA Date: Fri Oct 2 03:14:31 2020 +0200 Fix --with-json message * configure.ac (WIDE_EMACS_INT): Fix --with-json help message (bug#43754). diff --git a/configure.ac b/configure.ac index ae0c0d2a2e..f0c8e5210f 100644 --- a/configure.ac +++ b/configure.ac @@ -453,7 +453,7 @@ OPTION_DEFAULT_ON([cairo],[don't compile with Cairo drawing]) OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support]) OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support]) OPTION_DEFAULT_ON([native-image-api], [don't use native image APIs (GDI+ on Windows)]) -OPTION_DEFAULT_IFAVAILABLE([json], [don't compile with native JSON support]) +OPTION_DEFAULT_IFAVAILABLE([json], [compile with native JSON support]) OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts]) OPTION_DEFAULT_ON([harfbuzz],[don't use HarfBuzz for text shaping]) commit 40b81f847f12cf141467a02858d1ac09589cea2f Author: Trevor Murphy Date: Fri Oct 2 00:30:19 2020 +0200 Fix check for derived modes in display-buffer-reuse-mode-window * lisp/window.el (display-buffer-reuse-mode-window): Make the check for derived modes actually work (bug#38677). diff --git a/lisp/window.el b/lisp/window.el index 9aca94d502..5ed7a62bcf 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7712,7 +7712,7 @@ indirectly called by the latter." (with-current-buffer (window-buffer window) (cond ((memq major-mode allowed-modes) 'same) - ((derived-mode-p allowed-modes) + ((apply #'derived-mode-p allowed-modes) 'derived))))) (when (and mode? (not (and inhibit-same-window-p commit 6996204dd036650b7e1e7f9580055fefb033abe5 Author: Tino Calancha Date: Thu Oct 1 23:33:56 2020 +0200 Fix wdired-do-perm-changes when over Tramp * lisp/wdired.el (wdired-do-perm-changes) Use set-file-modes instead of external program (bug#39284). This fixes the problem of passing the wrong argument to the external chmod. diff --git a/lisp/wdired.el b/lisp/wdired.el index 806eb304d9..40f4cd9719 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -913,9 +913,9 @@ Like original function but it skips read-only words." (if (= (length perms-new) 10) (progn (setq perm-tmp - (int-to-string (wdired-perms-to-number perms-new))) - (unless (equal 0 (process-file dired-chmod-program - nil nil nil perm-tmp filename)) + (string-to-number + (int-to-string (wdired-perms-to-number perms-new)) 8)) + (unless (set-file-modes filename perm-tmp) (setq errors (1+ errors)) (dired-log "%s %s `%s' failed\n\n" dired-chmod-program perm-tmp filename))) commit 29435ecd8e31497a9cc461fcf88dbbf00876863a Author: Tino Calancha Date: Thu Oct 1 23:25:15 2020 +0200 Fix bug in wdired-get-filename * lisp/wdired.el (wdired-get-filename): Acknowledge the first argument (bug#39280). * test/lisp/wdired-tests.el (wdired-test-bug39280): Add test. diff --git a/lisp/wdired.el b/lisp/wdired.el index 6defbf8bc8..806eb304d9 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -344,7 +344,7 @@ non-nil means return old filename." ;; Don't unquote the old name, it wasn't quoted in the first place (and file (setq file (wdired-normalize-filename file (not old))))) (if (or no-dir old) - file + (if no-dir (file-relative-name file) file) (and file (> (length file) 0) (concat (dired-current-directory) file)))))) diff --git a/test/lisp/wdired-tests.el b/test/lisp/wdired-tests.el index b89e8c876e..f876967bf9 100644 --- a/test/lisp/wdired-tests.el +++ b/test/lisp/wdired-tests.el @@ -178,6 +178,22 @@ wdired-get-filename before and after editing." (server-force-delete) (delete-directory test-dir t)))) +(ert-deftest wdired-test-bug39280 () + "Test for https://debbugs.gnu.org/39280." + (let* ((test-dir (make-temp-file "test-dir" 'dir)) + (fname "foo") + (full-fname (expand-file-name fname test-dir))) + (make-empty-file full-fname) + (let ((buf (find-file-noselect test-dir))) + (unwind-protect + (with-current-buffer buf + (dired-toggle-read-only) + (dolist (old '(t nil)) + (should (equal fname (wdired-get-filename 'nodir old))) + (should (equal full-fname (wdired-get-filename nil old)))) + (wdired-finish-edit)) + (if buf (kill-buffer buf)) + (delete-directory test-dir t))))) (provide 'wdired-tests) ;;; wdired-tests.el ends here commit da591df90ae95a6bc34f43b1594fc58a91967304 Author: Alan Mackenzie Date: Thu Oct 1 20:35:40 2020 +0000 Enhance syntax-tests.el to test some comment character handling. * test/src/syntax-tests: Add a new section testing some aspects of comment handling in syntax.c. This needs further enhancement. It uses .... * test/data/syntax-comments.txt: A new test file. diff --git a/test/data/syntax-comments.txt b/test/data/syntax-comments.txt new file mode 100644 index 0000000000..74e08b1b65 --- /dev/null +++ b/test/data/syntax-comments.txt @@ -0,0 +1,66 @@ +/* This file is a test file for tests of the comment handling in src/syntax.c. + This includes the testing of comments which figure in parse-partial-sexp + and scan-lists. */ + +/* Straight C comments */ +1/* comment */1 +2/**/2 +3// comment +3 +4// +4 +5/*/5 +6*/6 +7/* \*/7 +8*/8 +9/* \\*/9 +10*/10 +11// \ +12 +11 +13// \\ +14 +13 +15/* /*/15 + + +/* Straight Pascal comments (not nested) */ +20}20 +21{ Comment }21 +22{}22 +23{ +}23 +24{ +25{25 +}24 +26{ \}26 + + +/* Straight Lisp comments (not nested) */ +30 +30 +31; Comment +31 +32;;;;;;;;; +32 +33; \ +33 + +/* Comments within lists */ +50{ /* comment */ }50 +51{ /**/ }51 +52{ // comment +}52 +53{ // +}53 +54{ // +}54 +55{/* */}55 +56{ /* \*/ }56 +57*/57 +58}58 + +Local Variables: +mode: fundamental +eval: (set-syntax-table (make-syntax-table)) +End: diff --git a/test/src/syntax-tests.el b/test/src/syntax-tests.el index 65c56b3b29..4bd8a8519c 100644 --- a/test/src/syntax-tests.el +++ b/test/src/syntax-tests.el @@ -82,4 +82,194 @@ also has open paren syntax (see Bug#24870)." (should (equal (parse-partial-sexp pointC pointX nil nil ppsC) ppsX))))) + +;;; Commentary: +;; The next bit tests the handling of comments in syntax.c, in +;; particular the function `forward-comment'. + +;; It is intended to enhance this bit to test nested comments and also +;; the interaction of `parse-partial-sexp' and `scan-lists' with +;; comments (2020-10-01). + +;; This bit uses the data file test/data/syntax-comments.txt. + +(defun syntax-comments-point (n forw) + "Return the buffer offset corresponding to the \"label\" N. +N is a decimal number which appears in the data file, usually +twice, as \"labels\". It can also be a negative number or zero. +FORW is t when we're using the label at BOL, nil for the one at EOL. + +If the label N doesn't exist in the current buffer, an exception +is thrown. + +When FORW is t and N positive, we return the position after the +first occurrence of label N at BOL in the data file. With FORW +nil, we return the position before the last occurrence of the +label at EOL in the data file. + +When N is negative, we return instead the position of the end of +line that the -N label is on. When it is zero, we return POINT." + (if (zerop n) + (point) + (let ((str (format "%d" (abs n)))) + (save-excursion + (if forw + (progn + (goto-char (point-min)) + (re-search-forward + (concat "^\\(" str "\\)\\([^0-9\n]\\|$\\)")) + (if (< n 0) + (progn (end-of-line) (point)) + (match-end 1))) + (goto-char (point-max)) + (re-search-backward + (concat "\\(^\\|[^0-9]\\)\\(" str "\\)$")) + (if (< n 0) + (progn (end-of-line) (point)) + (match-beginning 2))))))) + +(eval-and-compile + (defvar syntax-comments-section)) + +(defmacro syntax-comments (-type- -dir- res start &optional stop) + "Create an ERT test to test (forward-comment 1/-1). +The test uses a fixed name data file, which it visits. It calls +entry and exit functions to set up and tear down syntax entries +for comment characters. The test is given a name based on the +global variable `syntax-comments-section', the direction of +movement and the value of START. + +-TYPE- (unquoted) is a symbol from whose name the entry and exit +function names are derived by appending \"-in\" and \"-out\". + +-DIR- (unquoted) is `forward' or `backward', the direction +`forward-comment' is attempted. + +RES, t or nil, is the expected result from `forward-comment'. + +START and STOP are decimal numbers corresponding to labels in the +data file marking the start and expected stop positions. See +`syntax-comments-point' for a precise specification. If STOP is +missing or nil, the value of START is assumed for it." + (declare (debug t)) + (let ((forw + (cond + ((eq -dir- 'forward) t) + ((eq -dir- 'backward) nil) + (t (error "Invalid -dir- argument \"%s\" to `syntax-comments'" -dir-)))) + (start-str (format "%d" (abs start))) + (type -type-) + ) + `(ert-deftest ,(intern (concat "syntax-comments-" + syntax-comments-section + (if forw "-f" "-b") start-str)) + () + (with-current-buffer + (find-file + ,(expand-file-name "data/syntax-comments.txt" + (getenv "EMACS_TEST_DIRECTORY"))) + (,(intern (concat (symbol-name type) "-in"))) + (goto-char (syntax-comments-point ,start ,forw)) + (let ((stop (syntax-comments-point ,(or stop start) ,(not forw)))) + (should (eq (forward-comment ,(if forw 1 -1)) ,res)) + (should (eq (point) stop))) + (,(intern (concat (symbol-name type) "-out"))))))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; "Pascal" style comments - single character delimiters, the closing +;; delimiter not being newline. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun {-in () + (setq comment-end-can-be-escaped nil) + (modify-syntax-entry ?{ "<") + (modify-syntax-entry ?} ">")) +(defun {-out () + (modify-syntax-entry ?{ "(}") + (modify-syntax-entry ?} "){")) +(eval-and-compile + (setq syntax-comments-section "pascal")) + +(syntax-comments { forward nil 20 0) +(syntax-comments { backward nil 20 0) +(syntax-comments { forward t 21) +(syntax-comments { backward t 21) +(syntax-comments { forward t 22) +(syntax-comments { backward t 22) + +(syntax-comments { forward t 23) +(syntax-comments { backward t 23) +(syntax-comments { forward t 24) +(syntax-comments { backward t 24) +(syntax-comments { forward t 26) +(syntax-comments { backward t 26) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; "Lisp" style comments - single character opening delimiters on line +;; comments. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun \;-in () + (setq comment-end-can-be-escaped nil) + (modify-syntax-entry ?\n ">") + (modify-syntax-entry ?\; "<")) +(defun \;-out () + (modify-syntax-entry ?\n " ") + (modify-syntax-entry ?\; ".")) +(eval-and-compile + (setq syntax-comments-section "lisp")) + +(syntax-comments \; backward nil 30 30) +(syntax-comments \; forward t 31) +(syntax-comments \; backward t 31) +(syntax-comments \; forward t 32) +(syntax-comments \; backward t 32) +(syntax-comments \; forward t 33) +(syntax-comments \; backward t 33) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Emacs 27 "C" style comments - `comment-end-can-be-escaped' is non-nil. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun /*-in () + (setq comment-end-can-be-escaped t) + (modify-syntax-entry ?/ ". 124b") + (modify-syntax-entry ?* ". 23") + (modify-syntax-entry ?\n "> b")) +(defun /*-out () + (setq comment-end-can-be-escaped nil) + (modify-syntax-entry ?/ ".") + (modify-syntax-entry ?* ".") + (modify-syntax-entry ?\n " ")) +(eval-and-compile + (setq syntax-comments-section "c")) + +(syntax-comments /* forward t 1) +(syntax-comments /* backward t 1) +(syntax-comments /* forward t 2) +(syntax-comments /* backward t 2) +(syntax-comments /* forward t 3) +(syntax-comments /* backward t 3) + +(syntax-comments /* forward t 4) +(syntax-comments /* backward t 4) +(syntax-comments /* forward t 5 6) +(syntax-comments /* backward nil 5 0) +(syntax-comments /* forward nil 6 0) +(syntax-comments /* backward t 6 5) + +(syntax-comments /* forward t 7 8) +(syntax-comments /* backward nil 7 0) +(syntax-comments /* forward nil 8 0) +(syntax-comments /* backward t 8 7) +(syntax-comments /* forward t 9) +(syntax-comments /* backward t 9) + +(syntax-comments /* forward nil 10 0) +(syntax-comments /* backward nil 10 0) +(syntax-comments /* forward t 11) +(syntax-comments /* backward t 11) + +(syntax-comments /* forward t 13 14) +(syntax-comments /* backward nil 13 -14) +(syntax-comments /* forward t 15) +(syntax-comments /* backward t 15) + ;;; syntax-tests.el ends here commit 306fcc59dcd7d2a6ec8338dfff520a89d7a9121d Author: Juri Linkov Date: Thu Oct 1 22:17:40 2020 +0300 Use new faces isearch-group-odd and isearch-group-even (bug#43702) * lisp/isearch.el (isearch-group-odd, isearch-group-even): New faces instead of isearch-group-1 .. isearch-group-9. (isearch-highlight): Use new faces. diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index d44d7bee2a..d982a9e878 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1984,10 +1984,11 @@ the @code{search-highlight-submatches} variable. If this variable's value is @code{nil}, no special highlighting is done, but if the value is non-@code{nil}, text that matches @samp{\( @dots{} \)} constructs (a.k.a.@: ``subexpressions'') in the regular expression will be -highlighted with distinct faces, named @code{isearch-group-@var{n}}. -For instance, when searching for @samp{foo-\([0-9]+\)}, the part -matched by @samp{[0-9]+} will be highlighted with the -@code{isearch-group-1} face. +highlighted with distinct faces, named @code{isearch-group-odd} +for the odd group matches, and @code{isearch-group-even} +for the even group matches. For instance, when searching for +@samp{foo-\([0-9]+\)}, the part matched by @samp{[0-9]+} will be +highlighted with the @code{isearch-group-odd} face. @cindex lazy highlighting customizations @vindex isearch-lazy-highlight diff --git a/etc/NEWS b/etc/NEWS index 43a99afafa..3a176f22af 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1097,8 +1097,9 @@ keystrokes. +++ *** Interactive regular expression search now uses faces for sub-groups. -E.g., 'C-M-s foo-\([0-9]+\)' will now use the 'isearch-group-1' face +E.g., 'C-M-s foo-\([0-9]+\)' will now use the 'isearch-group-odd' face on the part of the regexp that matches the sub-expression "[0-9]+". +The even group matches are highlighted with the 'isearch-group-even' face. This is controlled by the 'search-highlight-submatches' user option. This feature is available only on terminals that have enough colors to distinguish between sub-expression highlighting. diff --git a/lisp/isearch.el b/lisp/isearch.el index 4e964b325c..781a8c5a93 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -271,9 +271,8 @@ are `word-search-regexp' \(`\\[isearch-toggle-word]'), `isearch-symbol-regexp' (defcustom search-highlight-submatches t "Whether to highlight regexp subexpressions of the current regexp match. - -The faces used to do the highlights are named `isearch-group-1', -`isearch-group-2', and so on." +The faces used to do the highlights are named `isearch-group-odd' and +`isearch-group-even'." :type 'boolean :version "28.1") @@ -3664,97 +3663,26 @@ since they have special meaning in a regexp." (defvar isearch-overlay nil) (defvar isearch-submatches-overlays nil) -(defface isearch-group-1 +(defface isearch-group-odd '((((class color) (min-colors 88) (background light)) (:background "#ff00ff" :foreground "lightskyblue1")) (((class color) (min-colors 88) (background dark)) (:background "palevioletred3" :foreground "brown4")) (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (first sub-group)." - :group 'isearch - :version "28.1") - -(defface isearch-group-2 - '((((class color) (min-colors 88) (background light)) - (:background "#d000d0" :foreground "lightskyblue1")) - (((class color) (min-colors 88) (background dark)) - (:background "#be698f" :foreground "black")) - (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (second sub-group)." - :group 'isearch - :version "28.1") - -(defface isearch-group-3 - '((((class color) (min-colors 88) (background light)) - (:background "#a000a0" :foreground "lightskyblue1")) - (((class color) (min-colors 88) (background dark)) - (:background "#a06080" :foreground "brown4")) - (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (third sub-group)." + "Face for highlighting Isearch the odd group matches." :group 'isearch :version "28.1") -(defface isearch-group-4 +(defface isearch-group-even '((((class color) (min-colors 88) (background light)) (:background "#800080" :foreground "lightskyblue1")) (((class color) (min-colors 88) (background dark)) (:background "#905070" :foreground "brown4")) (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (fourth sub-group)." - :group 'isearch - :version "28.1") - -(defface isearch-group-5 - '((((class color) (min-colors 88) (background light)) - (:background "#600060" :foreground "lightskyblue1")) - (((class color) (min-colors 88) (background dark)) - (:background "#804060" :foreground "black")) - (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (fifth sub-group)." - :group 'isearch - :version "28.1") - -(defface isearch-group-6 - '((((class color) (min-colors 88) (background light)) - (:background "#500050" :foreground "lightskyblue1")) - (((class color) (min-colors 88) (background dark)) - (:background "#703050" :foreground "white")) - (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (sixth sub-group)." - :group 'isearch - :version "28.1") - -(defface isearch-group-7 - '((((class color) (min-colors 88) (background light)) - (:background "#400040" :foreground "lightskyblue1")) - (((class color) (min-colors 88) (background dark)) - (:background "#602050" :foreground "white")) - (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (seventh sub-group)." - :group 'isearch - :version "28.1") - -(defface isearch-group-8 - '((((class color) (min-colors 88) (background light)) - (:background "#300030" :foreground "lightskyblue1")) - (((class color) (min-colors 88) (background dark)) - (:background "#501050" :foreground "white")) - (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (eighth sub-group)." + "Face for highlighting Isearch the even group matches." :group 'isearch :version "28.1") -(defface isearch-group-9 - '((((class color) (min-colors 88) (background light)) - (:background "#200020" :foreground "lightskyblue1")) - (((class color) (min-colors 88) (background dark)) - (:background "#400040" :foreground "white")) - (t (:inherit isearch))) - "Face for highlighting Isearch sub-group matches (ninth sub-group)." - :group 'isearch - :version "28.1") - - (defun isearch-highlight (beg end) (if search-highlight (if isearch-overlay @@ -3769,14 +3697,14 @@ since they have special meaning in a regexp." isearch-regexp) (mapc 'delete-overlay isearch-submatches-overlays) (setq isearch-submatches-overlays nil) - (let ((i 0) ov) - (while (<= i 9) - (when (match-beginning i) - (setq ov (make-overlay (match-beginning i) (match-end i))) - (overlay-put ov 'face (intern-soft (format "isearch-group-%d" i))) + (dotimes (i (/ (length (match-data)) 2)) + (unless (zerop i) + (let ((ov (make-overlay (match-beginning i) (match-end i)))) + (overlay-put ov 'face (if (zerop (mod i 2)) + 'isearch-group-even + 'isearch-group-odd)) (overlay-put ov 'priority 1002) - (push ov isearch-submatches-overlays)) - (setq i (1+ i)))))) + (push ov isearch-submatches-overlays)))))) (defun isearch-dehighlight () (when isearch-overlay commit d460677b19299fd43fa3a088895a406f9975a3ee Author: Allen Li Date: Thu Oct 1 20:53:27 2020 +0200 Make recentf daily cleanup repeat * lisp/recentf.el (recentf-auto-cleanup): Fix wording. * lisp/recentf.el (recentf-auto-cleanup): Make timer repeat, update docstring. * etc/NEWS: Update news (bug#39638). diff --git a/etc/NEWS b/etc/NEWS index b4f29ab783..43a99afafa 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -152,6 +152,13 @@ your init file: (setq frame-title-format '(multiple-frames "%b" ("" invocation-name "@" system-name))) +** recentf + +--- +*** 'recentf-auto-cleanup' time string now repeats. +When 'recentf-auto-cleanup' is set to a time string, it now repeats +every day, rather than only running once after the mode is turned on. + * Editing Changes in Emacs 28.1 diff --git a/lisp/recentf.el b/lisp/recentf.el index 877edd4be1..61c39de12b 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -245,7 +245,10 @@ The following values can be set: - A number Cleanup each time Emacs has been idle that number of seconds. - A time string - Cleanup at specified time string, for example at \"11:00pm\". + Cleanup at specified time string daily, for example at \"11:00pm\". + +If a time string is provided and it is already past the specified time +for the current day, the first cleanup happens immediately as for `mode'. Setting this variable directly does not take effect; use \\[customize]. @@ -257,7 +260,7 @@ cleanup the list." :value mode) (const :tag "Never" :value never) - (number :tag "When idle that seconds" + (number :tag "When idle after (seconds)" :value 300) (string :tag "At time" :value "11:00pm")) @@ -371,7 +374,8 @@ See also the option `recentf-auto-cleanup'.") recentf-auto-cleanup t 'recentf-cleanup)) ((stringp recentf-auto-cleanup) (run-at-time - recentf-auto-cleanup nil 'recentf-cleanup)))))) + ;; Repeat every 24 hours. + recentf-auto-cleanup (* 24 60 60) 'recentf-cleanup)))))) ;;; File functions ;; commit cd8880514f0962cd3d9aa5e797402a68182bb191 Author: Boruch Baum Date: Thu Oct 1 20:26:13 2020 +0200 command-execute doc string clarification * lisp/simple.el (command-execute): Doc string clarification (bug#43749). diff --git a/lisp/simple.el b/lisp/simple.el index 05a74d90d6..b6d4e0603e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2067,13 +2067,18 @@ invoking, give a prefix argument to `execute-extended-command'." ;; BEWARE: Called directly from the C code. "Execute CMD as an editor command. CMD must be a symbol that satisfies the `commandp' predicate. -Optional second arg RECORD-FLAG non-nil -means unconditionally put this command in the variable `command-history'. -Otherwise, that is done only if an arg is read using the minibuffer. -The argument KEYS specifies the value to use instead of (this-command-keys) -when reading the arguments; if it is nil, (this-command-keys) is used. -The argument SPECIAL, if non-nil, means that this command is executing -a special event, so ignore the prefix argument and don't clear it." + +Optional second arg RECORD-FLAG non-nil means unconditionally put +this command in the variable `command-history'. Otherwise, that +is done only if an arg is read using the minibuffer. + +The argument KEYS specifies the value to use instead of the +return value of the `this-command-keys' function when reading the +arguments; if it is nil, `this-command-keys' is used. + +The argument SPECIAL, if non-nil, means that this command is +executing a special event, so ignore the prefix argument and +don't clear it." (setq debug-on-next-call nil) (let ((prefixarg (unless special ;; FIXME: This should probably be done around commit d00eb41fc22ab3643275f8f6d895f928ed535815 Author: Lars Ingebrigtsen Date: Thu Oct 1 19:42:45 2020 +0200 Fix loading WSDL data again * lisp/net/soap-client.el (soap-make-wsdl): Change the WSDL namespace back again. diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index 504304f385..241ce9efcb 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -2111,7 +2111,9 @@ This is a specialization of `soap-decode-type' for ;; Add the XSD types to the wsdl document (let ((ns (soap-make-xs-basic-types - "https://www.w3.org/2001/XMLSchema" "xsd"))) + ;; The following string is a name and not an URL, so + ;; the "http:" should not be changed. + "http://www.w3.org/2001/XMLSchema" "xsd"))) (soap-wsdl-add-namespace ns wsdl) (soap-wsdl-add-alias "xsd" (soap-namespace-name ns) wsdl)) commit 2017bf0dd1ddd9b18cb95c42e3ef4098bff69fa9 Author: Lars Ingebrigtsen Date: Thu Oct 1 18:49:45 2020 +0200 Fix restoring data in visual-line-mode * lisp/simple.el (visual-line-mode): Only save values once, even if the mode is switched on twice (bug#43730). This makes both previously set local values for variables like truncate-lines, as well as default values for truncate-lines restorable. * lisp/emulation/cua-base.el (cua-mode): Ditto. diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index c4dcb76446..926305e607 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1379,9 +1379,10 @@ the prefix fallback behavior." (cond (cua-mode - (setq cua--saved-state - (list - (and (boundp 'delete-selection-mode) delete-selection-mode))) + (unless cua--saved-state + (setq cua--saved-state + (list + (and (boundp 'delete-selection-mode) delete-selection-mode)))) (if cua-delete-selection (delete-selection-mode 1) (if (and (boundp 'delete-selection-mode) delete-selection-mode) diff --git a/lisp/simple.el b/lisp/simple.el index fef22c2fa6..05a74d90d6 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -7275,15 +7275,16 @@ Mode' for details." :lighter " Wrap" (if visual-line-mode (progn - (set (make-local-variable 'visual-line--saved-state) nil) - ;; Save the local values of some variables, to be restored if - ;; visual-line-mode is turned off. - (dolist (var '(line-move-visual truncate-lines - truncate-partial-width-windows - word-wrap fringe-indicator-alist)) - (if (local-variable-p var) - (push (cons var (symbol-value var)) - visual-line--saved-state))) + (unless visual-line--saved-state + (setq-local visual-line--saved-state (list nil)) + ;; Save the local values of some variables, to be restored if + ;; visual-line-mode is turned off. + (dolist (var '(line-move-visual truncate-lines + truncate-partial-width-windows + word-wrap fringe-indicator-alist)) + (if (local-variable-p var) + (push (cons var (symbol-value var)) + visual-line--saved-state)))) (set (make-local-variable 'line-move-visual) t) (set (make-local-variable 'truncate-partial-width-windows) nil) (setq truncate-lines nil @@ -7297,7 +7298,8 @@ Mode' for details." (kill-local-variable 'truncate-partial-width-windows) (kill-local-variable 'fringe-indicator-alist) (dolist (saved visual-line--saved-state) - (set (make-local-variable (car saved)) (cdr saved))) + (when (car saved) + (set (make-local-variable (car saved)) (cdr saved)))) (kill-local-variable 'visual-line--saved-state))) (defun turn-on-visual-line-mode () commit af72f6d5109ba2b6e92bbc6f1ef12d83dae70e13 Author: Stefan Kangas Date: Thu Oct 1 15:34:08 2020 +0200 Silence byte-compiler in two tests * test/lisp/obsolete/cl-tests.el (require): * test/lisp/simple-tests.el (simple-test-count-words-bug-41761): Silence byte-compiler. diff --git a/test/lisp/obsolete/cl-tests.el b/test/lisp/obsolete/cl-tests.el index 37061df0a7..3f3fda3638 100644 --- a/test/lisp/obsolete/cl-tests.el +++ b/test/lisp/obsolete/cl-tests.el @@ -21,7 +21,8 @@ ;;; Code: -(require 'cl) +(with-no-warnings + (require 'cl)) (require 'ert) diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el index 457de91c14..d4b316811e 100644 --- a/test/lisp/simple-tests.el +++ b/test/lisp/simple-tests.el @@ -44,7 +44,7 @@ ;;; `count-words' (ert-deftest simple-test-count-words-bug-41761 () (with-temp-buffer - (dotimes (i 10) (insert (propertize "test " 'field (cons nil nil)))) + (dotimes (_i 10) (insert (propertize "test " 'field (cons nil nil)))) (should (= (count-words (point-min) (point-max)) 10)))) commit c6fa0ad315e38167cb81a4d8c143cc53ad783cc3 Author: Stefan Kangas Date: Thu Oct 1 15:24:21 2020 +0200 ; Prefer https to http in many URLs These were all tested with https and confirmed working. diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 4130f5aad3..141ad2353e 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -536,7 +536,7 @@ codes. Finally, the so changed list of codes is returned." (cons new (remq new codes)))) (2 (unless (memq new '(20 26 28 29)) ;; The standard says `21 doubly underlined' while - ;; http://en.wikipedia.org/wiki/ANSI_escape_code claims + ;; https://en.wikipedia.org/wiki/ANSI_escape_code claims ;; `21 Bright/Bold: off or Underline: Double'. (remq (- new 20) (pcase new (22 (remq 1 codes)) diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 7b86eb095b..709c09ea09 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -37,14 +37,14 @@ ;;; Updated April 2002 by Jochen Küpper ;;; Updated August 2007, using -;;; CODATA (http://physics.nist.gov/cuu/Constants/index.html) -;;; NIST (http://physics.nist.gov/Pubs/SP811/appenB9.html) +;;; CODATA (https://physics.nist.gov/cuu/Constants/index.html) +;;; NIST (https://physics.nist.gov/Pubs/SP811/appenB9.html) ;;; ESUWM (Encyclopaedia of Scientific Units, Weights and ;;; Measures, by François Cardarelli) ;;; All conversions are exact unless otherwise noted. ;; CODATA values updated February 2016, using 2014 adjustment -;; http://arxiv.org/pdf/1507.07956.pdf +;; https://arxiv.org/pdf/1507.07956.pdf ;; Updated November 2018 for the redefinition of the SI ;; https://www.bipm.org/utils/en/pdf/CGPM/Draft-Resolution-A-EN.pdf @@ -59,7 +59,7 @@ ( mi "5280 ft" "Mile" ) ( au "149597870691. m" "Astronomical Unit" nil "149597870691 m (*)") - ;; (approx) NASA JPL (http://neo.jpl.nasa.gov/glossary/au.html) + ;; (approx) NASA JPL (https://neo.jpl.nasa.gov/glossary/au.html) ( lyr "c yr" "Light Year" ) ( pc "3.0856775854*10^16 m" "Parsec (**)" nil "3.0856775854 10^16 m (*)") ;; (approx) ESUWM diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el index 2aa0ab0e3f..cc53f69691 100644 --- a/lisp/cedet/semantic/java.el +++ b/lisp/cedet/semantic/java.el @@ -321,7 +321,7 @@ If NOSNARF is `lex', then return the semantic lex token." (defvar semantic-java-doc-line-tags nil "Valid javadoc line tags. Ordered following Sun's Tag Convention at -") +") (defvar semantic-java-doc-with-name-tags nil "Javadoc tags which have a name.") diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 9305664e31..ec9a968013 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -210,7 +210,7 @@ multilingual development. This is a fairly large file, not typically present on GNU systems. At the time of writing it is at the URL -`http://www.unicode.org/Public/UNIDATA/UnicodeData.txt'." +`https://www.unicode.org/Public/UNIDATA/UnicodeData.txt'." :group 'mule :version "22.1" :type '(choice (const :tag "None" nil) diff --git a/lisp/doc-view.el b/lisp/doc-view.el index 60f6d6350c..f958cfacbf 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -24,8 +24,8 @@ ;; doc-view.el requires GNU Emacs 22.1 or newer. You also need Ghostscript, ;; `dvipdf' (comes with Ghostscript) or `dvipdfm' (comes with teTeX or TeXLive) -;; and `pdftotext', which comes with xpdf (http://www.foolabs.com/xpdf/) or -;; poppler (http://poppler.freedesktop.org/). +;; and `pdftotext', which comes with xpdf (https://www.foolabs.com/xpdf/) or +;; poppler (https://poppler.freedesktop.org/). ;;; Commentary: diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 5e6f7c8d10..b799b2427c 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -198,12 +198,12 @@ PAR is a number of a regexp grouping whose text will be passed to :inline t (integer :tag "Regexp section number"))))) -(defcustom erc-emacswiki-url "http://www.emacswiki.org/cgi-bin/wiki.pl?" +(defcustom erc-emacswiki-url "https://www.emacswiki.org/cgi-bin/wiki.pl?" "URL of the EmacsWiki Homepage." :group 'erc-button :type 'string) -(defcustom erc-emacswiki-lisp-url "http://www.emacswiki.org/elisp/" +(defcustom erc-emacswiki-lisp-url "https://www.emacswiki.org/elisp/" "URL of the EmacsWiki ELisp area." :group 'erc-button :type 'string) diff --git a/lisp/files.el b/lisp/files.el index 53a5fcb87e..c2c58dae93 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1392,7 +1392,7 @@ it means chase no more than that many links and then stop." newname)) ;; A handy function to display file sizes in human-readable form. -;; See http://en.wikipedia.org/wiki/Kibibyte for the reference. +;; See https://en.wikipedia.org/wiki/Kibibyte for the reference. (defun file-size-human-readable (file-size &optional flavor space unit) "Produce a string showing FILE-SIZE in human-readable form. @@ -7776,7 +7776,7 @@ Otherwise, trash FILENAME using the freedesktop.org conventions, (let (delete-by-moving-to-trash) (rename-file fn new-fn)))) ;; Otherwise, use the freedesktop.org method, as specified at - ;; http://freedesktop.org/wiki/Specifications/trash-spec + ;; https://freedesktop.org/wiki/Specifications/trash-spec (t (let* ((xdg-data-dir (directory-file-name diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index ef010d6e9c..cf76277689 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -5659,7 +5659,7 @@ The result is a fixnum." (mail-file-babyl-p filename)) ;; gnus-output-to-mail does the wrong thing with live, mbox ;; Rmail buffers in Emacs 23. - ;; http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597255 + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597255 (let ((buff (find-buffer-visiting filename))) (and buff (with-current-buffer buff (eq major-mode 'rmail-mode))))) @@ -8591,7 +8591,7 @@ Meant for use on `completion-at-point-functions'." ;; FIXME: What is the most common term (circular letter, form letter, serial ;; letter, standard letter) for such kind of letter? See also -;; +;; ;; FIXME: Maybe extent message-mode's font-lock support to recognize ;; `message-form-letter-separator', i.e. highlight each message like a single diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 282465722d..958e24c39f 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -70,7 +70,7 @@ (mm-coding-system-p 'cp932)) '((windows-31j . cp932))) ;; Charset name: GBK, Charset aliases: CP936, MS936, windows-936 - ;; http://www.iana.org/assignments/charset-reg/GBK + ;; https://www.iana.org/assignments/charset-reg/GBK ;; Emacs 22.1 has cp936, but not gbk, so we alias it: ,@(when (and (not (mm-coding-system-p 'gbk)) (mm-coding-system-p 'cp936)) diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 116d7ee9fb..48c07da1cc 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -450,7 +450,7 @@ nnrss: %s: Not valid XML %s and libxml-parse-html-region doesn't work %s" (defun nnrss-normalize-date (date) "Return a date string of DATE in the style of RFC 822 and its successors. This function handles the ISO 8601 date format described in -URL `http://www.w3.org/TR/NOTE-datetime', and also the RFC 822 style +URL `https://www.w3.org/TR/NOTE-datetime', and also the RFC 822 style which RSS 2.0 allows." (let (case-fold-search vector year month day time zone cts given) (cond ((null date)) ; do nothing for this case diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el index 3da45a2b62..bf593865d7 100644 --- a/lisp/gnus/spam-stat.el +++ b/lisp/gnus/spam-stat.el @@ -4,7 +4,7 @@ ;; Author: Alex Schroeder ;; Keywords: network -;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SpamStat +;; URL: https://www.emacswiki.org/cgi-bin/wiki.pl?SpamStat ;; This file is part of GNU Emacs. diff --git a/lisp/image-dired.el b/lisp/image-dired.el index 6f297672ca..c539aaf33f 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -60,7 +60,7 @@ ;; ============= ;; ;; * The ImageMagick package. Currently, `convert' and `mogrify' are -;; used. Find it here: http://www.imagemagick.org. +;; used. Find it here: https://www.imagemagick.org. ;; ;; * For non-lossy rotation of JPEG images, the JpegTRAN program is ;; needed. @@ -205,7 +205,7 @@ the index.html page that image-dired creates." :group 'image-dired) (defcustom image-dired-gallery-image-root-url -"http://your.own.server/image-diredpics" +"https://your.own.server/image-diredpics" "URL where the full size images are to be found. Note that this path has to be configured in your web server. Image-Dired expects to find pictures in this directory." @@ -213,7 +213,7 @@ expects to find pictures in this directory." :group 'image-dired) (defcustom image-dired-gallery-thumb-image-root-url -"http://your.own.server/image-diredthumbs" +"https://your.own.server/image-diredthumbs" "URL where the thumbnail images are to be found. Note that this path has to be configured in your web server. Image-Dired expects to find pictures in this directory." diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el index 6b7419fa4c..33d0f0dda2 100644 --- a/lisp/international/ucs-normalize.el +++ b/lisp/international/ucs-normalize.el @@ -25,8 +25,8 @@ ;; This program has passed the NormalizationTest-5.2.0.txt. ;; ;; References: -;; http://www.unicode.org/reports/tr15/ -;; http://www.unicode.org/review/pr-29.html +;; https://www.unicode.org/reports/tr15/ +;; https://www.unicode.org/review/pr-29.html ;; ;; HFS-Normalization: ;; Reference: @@ -131,7 +131,7 @@ #x1D1BF #x1D1C0) "Composition Exclusion List. This list is taken from - http://www.unicode.org/Public/UNIDATA/5.2/CompositionExclusions.txt") + https://www.unicode.org/Public/UNIDATA/5.2/CompositionExclusions.txt") ;; Unicode ranges that decompositions & combining characters are defined. (defvar check-range nil) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index ec31e21d7d..3260b67a99 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -1528,7 +1528,7 @@ ENTRY is the name of a password-store entry. The key used to retrieve the password is the symbol `secret'. The convention used as the format for a password-store file is -the following (see http://www.passwordstore.org/#organization): +the following (see https://www.passwordstore.org/#organization): secret key1: value1 @@ -17632,7 +17632,7 @@ The main features of this mode are \\[idlwave-info] to display (complain to your sysadmin if that does not work). For Postscript, PDF, and HTML versions of the documentation, check IDLWAVE's homepage at URL - `http://github.com/jdtsmith/idlwave'. + `https://github.com/jdtsmith/idlwave'. IDLWAVE has customize support - see the group `idlwave'. 10.Keybindings @@ -21650,7 +21650,7 @@ upper atmosphere. These cause momentary pockets of higher-pressure air to form, which act as lenses that deflect incoming cosmic rays, focusing them to strike the drive platter and flip the desired bit. You can type `M-x butterfly C-M-c' to run it. This is a permuted -variation of `C-x M-c M-butterfly' from url `http://xkcd.com/378/'." t nil) +variation of `C-x M-c M-butterfly' from url `https://xkcd.com/378/'." t nil) (autoload 'list-dynamic-libraries "misc" "\ Display a list of all dynamic libraries known to Emacs. @@ -28941,7 +28941,7 @@ to use for finding the schema. ;;;### (autoloads nil "rng-xsd" "nxml/rng-xsd.el" (0 0 0 0)) ;;; Generated autoloads from nxml/rng-xsd.el -(put 'http://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile #'rng-xsd-compile) +(put 'https://www\.w3\.org/2001/XMLSchema-datatypes 'rng-dt-compile #'rng-xsd-compile) (autoload 'rng-xsd-compile "rng-xsd" "\ Provide W3C XML Schema as a RELAX NG datatypes library. @@ -33472,7 +33472,7 @@ buffer, and leaves the previous contents of the buffer untouched. References used for this implementation: HTML: - URL `http://www.w3.org' + URL `https://www.w3.org' LaTeX: URL `http://www.maths.tcd.ie/~dwilkins/LaTeXPrimer/Tables.html' diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el index d4170564c5..cbc555d1fa 100644 --- a/lisp/leim/quail/ipa.el +++ b/lisp/leim/quail/ipa.el @@ -340,7 +340,7 @@ See http://www.phon.ucl.ac.uk/home/sampa/ipasam-x.pdf for a full definition of the mapping.") (quail-define-rules - ;; Table taken from http://en.wikipedia.org/wiki/X-SAMPA, checked with + ;; Table taken from https://en.wikipedia.org/wiki/X-SAMPA, checked with ;; http://www.phon.ucl.ac.uk/home/sampa/ipasam-x.pdf ("d`" "ɖ") ;; Voiced retroflex plosive U+0256 diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index f1a455dce2..bd9aef17a8 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1852,8 +1852,8 @@ place. It affects how `mail-extract-address-components' works." ;; ;; Source: ISO 3166 Maintenance Agency ;; http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1-semic.txt -;; http://www.iana.org/domain-names.htm -;; http://www.iana.org/cctld/cctld-whois.htm +;; https://www.iana.org/domain-names.htm +;; https://www.iana.org/cctld/cctld-whois.htm ;; Latest change: 2007/11/15 (defconst mail-extr-all-top-level-domains diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 1786608dd6..63c8f14085 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -50,7 +50,7 @@ ;; Modified by Simon Josefsson , 22/2/99, to support SMTP ;; Authentication by the AUTH mechanism. -;; See http://www.ietf.org/rfc/rfc2554.txt +;; See https://www.ietf.org/rfc/rfc2554.txt ;;; Code: ;;; Dependencies diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index e8a660aab2..3ac5c8f7ae 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -1914,7 +1914,7 @@ of images into \"X-Face:\" header fields (see URL Use the \"make-face\" script to convert a JPEG image to the higher resolution, color, \"Face:\" header field (see URL -`http://quimby.gnus.org/circus/face/make-face'). +`https://quimby.gnus.org/circus/face/make-face'). The URL of any image can be used for the \"X-Image-URL:\" field and no processing of the image is required. @@ -2420,11 +2420,11 @@ of citations entirely, choose \"None\"." ;; These entries have been intentionally excluded by the developers. ;; "Comments:" ; RFC 822 (or later) - show this one -;; "Fax:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ -;; "Mail-System-Version:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ -;; "Mailer:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ +;; "Fax:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ +;; "Mail-System-Version:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ +;; "Mailer:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ ;; "Organization:" ; -;; "Phone:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ +;; "Phone:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ ;; "Reply-By:" ; RFC 2156 ;; "Reply-To:" ; RFC 822 (or later) ;; "Sender:" ; @@ -2437,13 +2437,13 @@ of citations entirely, choose \"None\"." ;; Mention source, if known. (defvar mh-invisible-header-fields-internal '( - "Abuse-Reports-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Abuse-Reports-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Accept-Language:" "AcceptLanguage:" "Accreditor:" ; Habeas "Also-Control:" ; H. Spencer: News Article Format and Transmission, June 1994 "Alternate-recipient:" ; RFC 2156 - "Approved-By:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Approved-By:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Approved:" ; RFC 1036 "Article-Names:" ; H. Spencer: News Article Format and Transmission, June 1994 "Article-Updates:" ; H. Spencer: News Article Format and Transmission, June 1994 @@ -2454,7 +2454,7 @@ of citations entirely, choose \"None\"." "Bounces-To:" "Bounces_to:" "Bytes:" - "Cancel-Key:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Cancel-Key:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Cancel-Lock:" ; NNTP posts "Comment:" ; Shows up with DomainKeys "Content-" ; RFC 2045, 1123, 1766, 1864, 2045, 2110, 2156, 2183, 2912 @@ -2475,14 +2475,14 @@ of citations entirely, choose \"None\"." "DomainKey-Signature:" "Encoding:" ; RFC 1505 "Envelope-to:" - "Errors-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Errors-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Expires:" ; RFC 1036 "Expiry-Date:" ; RFC 2156 "Face:" ; Gnus Face header "Followup-To:" ; RFC 1036 - "For-Approval:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "For-Comment:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "For-Handling:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "For-Approval:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "For-Comment:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "For-Handling:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Forwarded:" ; MH "From " ; sendmail "Generate-Delivery-Report:" ; RFC 2156 @@ -2493,12 +2493,12 @@ of citations entirely, choose \"None\"." "Language:" ; RFC 2156 "Lines:" ; RFC 1036 "List-" ; RFC 2369, 2919 - "Mail-Copies-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "Mail-Followup-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Mail-Copies-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Mail-Followup-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Mail-from:" ; MH - "Mail-Reply-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Mail-Reply-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Mailing-List:" ; Egroups/yahoogroups mailing list manager - "Message-Content:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Message-Content:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Message-ID:" ; RFC 822 (or later) "Message-Type:" ; RFC 2156 "Mime-Version" ; RFC 2045 @@ -2516,42 +2516,42 @@ of citations entirely, choose \"None\"." "Original-Recipient:" ; RFC 2298 "Original-To:" ; mail to news "Original-X-" ; mail to news - "Origination-Client:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "Originator:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Origination-Client:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Originator:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "P1-Content-Type:" ; X400 "P1-Message-Id:" ; X400 "P1-Recipient:" ; X400 "Path:" ; RFC 1036 "Pics-Label:" ; W3C - "Posted-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "Precedence:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Posted-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Precedence:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Prev-Resent" ; MH "Prevent-NonDelivery-Report:" ; RFC 2156 "Priority:" ; RFC 2156 - "Read-Receipt-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Read-Receipt-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Received-SPF:" ; Gmail "Received:" ; RFC 822 (or later) "References:" ; RFC 822 (or later) - "Registered-Mail-Reply-Requested-By:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Registered-Mail-Reply-Requested-By:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Remailed-" ; MH - "Replaces:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Replaces:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Replied:" ; MH "Resent-" ; RFC 822 (or later) "Return-Path:" ; RFC 822 (or later) - "Return-Receipt-Requested:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "Return-Receipt-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Return-Receipt-Requested:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Return-Receipt-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Seal-Send-Time:" "See-Also:" ; H. Spencer: News Article Format and Transmission, June 1994 "Sensitivity:" ; RFC 2156, 2421 - "Speech-Act:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Speech-Act:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Status:" ; sendmail "Supersedes:" ; H. Spencer: News Article Format and Transmission, June 1994 - "Telefax:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Telefax:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Thread-" "Thread-Index:" "Thread-Topic:" - "Translated-By:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "Translation-Of:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Translated-By:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "Translation-Of:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Ua-Content-Id:" ; X400 "Via:" ; MH "X-Abuse-and-DMCA-" @@ -2559,7 +2559,7 @@ of citations entirely, choose \"None\"." "X-Accept-Language:" ; Netscape/Mozilla "X-Ack:" "X-ACL-Warn:" ; http://www.exim.org - "X-Admin:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Admin:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Administrivia-To:" "X-AMAZON" ; Amazon.com "X-AnalysisOut:" ; Exchange @@ -2594,9 +2594,9 @@ of citations entirely, choose \"None\"." "X-CanIt-Geo:" ; IEEE spam filter "X-Cloudmark-SP-" ; Cloudmark (www.cloudmark.com) "X-Comment:" ; AT&T Mailennium - "X-Complaints-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Complaints-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Completed:" - "X-Confirm-Reading-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Confirm-Reading-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Content-Filtered-By:" "X-ContentStamp:" ; NetZero "X-Country-Chain:" ; http://www.declude.com/x-note.htm @@ -2622,13 +2622,13 @@ of citations entirely, choose \"None\"." "X-Email-Type-Id:" ; Paypal http://www.paypal.com "X-Enigmail-Version:" "X-Envelope-Date:" ; GNU mailutils - "X-Envelope-From:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Envelope-From:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Envelope-Sender:" - "X-Envelope-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Envelope-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-EviteMessageId:" ; evite.com "X-Evolution:" ; Evolution mail client "X-ExtLoop" - "X-Face:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Face:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Facebook" ; Facebook "X-FB-SS:" "X-fmx-" @@ -2652,7 +2652,7 @@ of citations entirely, choose \"None\"." "X-Identity:" ; http://www.declude.com/x-note.htm "X-IEEE-UCE-" ; IEEE spam filter "X-Image-URL:" - "X-IMAP:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-IMAP:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Info:" ; NTMail "X-IronPort-" ; IronPort AV "X-ISI-4-30-3-MailScanner:" @@ -2662,12 +2662,12 @@ of citations entirely, choose \"None\"." "X-Juno-" ; Juno "X-Key:" "X-Launchpad-" ; plaunchpad.net - "X-List-Host:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-List-Host:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-List-Subscribe:" ; Unknown mailing list managers "X-List-Unsubscribe:" ; Unknown mailing list managers "X-Listprocessor-" ; ListProc(tm) by CREN - "X-Listserver:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "X-Loop:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Listserver:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Loop:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Lrde-Mailscanner:" "X-Lumos-SenderID:" ; Roving ConstantContact "X-mail_abuse_inquiries:" ; http://www.salesforce.com @@ -2693,18 +2693,18 @@ of citations entirely, choose \"None\"." "X-MessageWall-Score:" ; Unknown mailing list manager, AUC TeX "X-MHE-Checksum:" ; Checksum added during index search "X-MIME-Autoconverted:" ; sendmail - "X-MIMEOLE:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/sendmail + "X-MIMEOLE:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/sendmail "X-MIMETrack:" "X-Mms-" ; T-Mobile pictures "X-Mozilla-Status:" ; Netscape/Mozilla "X-MS-" ; MS Outlook "X-Msmail-" ; MS Outlook - "X-MSMail-Priority" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-MSMail-Priority" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-MXL-Hash:" "X-NAI-Spam-" ; Network Associates Inc. SpamKiller "X-News:" ; News - "X-Newsreader:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "X-No-Archive:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Newsreader:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-No-Archive:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Notes-Item:" ; Lotus Notes Domino structured header "X-Notification-" ; Google+ "X-Notifications:" ; Google+ @@ -2713,7 +2713,7 @@ of citations entirely, choose \"None\"." "X-ORBL:" "X-Orcl-Content-Type:" "X-Organization:" - "X-Original-Arrival-Type:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Original-Arrival-Type:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Original-Complaints-To:" "X-Original-Date:" ; SourceForge mailing list manager "X-Original-To:" @@ -2733,10 +2733,10 @@ of citations entirely, choose \"None\"." "X-Provags-ID:" "X-PSTN-" "X-Qotd-" ; User added - "X-RCPT-TO:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-RCPT-TO:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Received-Date:" "X-Received:" - "X-Report-Abuse-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Report-Abuse-To:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Request-" "X-Resolved-to:" ; fastmail.fm "X-Return-Path-Hint:" ; Roving ConstantContact @@ -2753,7 +2753,7 @@ of citations entirely, choose \"None\"." "X-SBRule:" ; Spam "X-Scanned-By:" "X-Sender-ID:" ; Google+ - "X-Sender:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-Sender:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Sendergroup:" ; Cisco Email Security (formerly IronPort; http://www.ironport.com) "X-Server-Date:" "X-Server-Uuid:" @@ -2776,11 +2776,11 @@ of citations entirely, choose \"None\"." "X-TM-IMSS-Message-ID:" ; http://www.trendmicro.com "X-Trace:" "X-UID" - "X-UIDL:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-UIDL:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Unity" "X-UNTD-" ; NetZero - "X-URI:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "X-URL:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-URI:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-URL:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-USANET-" ; usa.net "X-Usenet-Provider" "X-UserInfo1:" @@ -2792,7 +2792,7 @@ of citations entirely, choose \"None\"." "X-VSMLoop:" ; NTMail "X-WebTV-Signature:" "X-Wss-Id:" ; Worldtalk gateways - "X-X-Sender:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "X-X-Sender:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-XPT-XSL-Name:" ; Paypal http://www.paypal.com "X-xsi-" "X-XWALL-" ; http://www.dataenter.co.at/doc/xwall_undocumented_config.htm @@ -3036,7 +3036,7 @@ supports it. The first header field used, if present, is the Gnus-specific \"Face:\" field. The \"Face:\" field appeared in GNU Emacs 21 and XEmacs. For more information, see URL -`http://quimby.gnus.org/circus/face/'. Next is the traditional +`https://quimby.gnus.org/circus/face/'. Next is the traditional \"X-Face:\" header field. The display of this field requires the \"uncompface\" program (see URL `ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.z'). Recent @@ -3049,7 +3049,7 @@ header field if neither the \"Face:\" nor the \"X-Face:\" fields are present. The display of the images requires \"wget\" (see URL `https://www.gnu.org/software/wget/wget.html'), \"fetch\", or \"curl\" to fetch the image and the \"convert\" program from the ImageMagick -suite (see URL `http://www.imagemagick.org/'). Of the three header +suite (see URL `https://www.imagemagick.org/'). Of the three header fields this is the most efficient in terms of network usage since the image doesn't need to be transmitted with every single mail. diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el index fc30187245..43a589aeca 100644 --- a/lisp/mh-e/mh-thread.el +++ b/lisp/mh-e/mh-thread.el @@ -26,7 +26,7 @@ ;; The threading portion of this files tries to implement the ;; algorithm described at: -;; http://www.jwz.org/doc/threading.html +;; https://www.jwz.org/doc/threading.html ;; It also begins to implement the threading section of the IMAP - ;; SORT and THREAD Extensions RFC at: ;; http://tools.ietf.org/html/rfc5256 diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index ef3651b033..8c7d33a67d 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -771,7 +771,7 @@ This command uses `smbclient-program' to connect to HOST." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Full list is available at: -;; http://www.iana.org/assignments/port-numbers +;; https://www.iana.org/assignments/port-numbers (defvar network-connection-service-alist (list (cons 'echo 7) diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 2c32a2cf2e..f45abf780f 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -890,7 +890,7 @@ Argument BUFFER is the buffer of the retrieval process." ;; Atom 1.0 feed. ;; (and (eq 'feed (xml-node-name topnode)) - ;; (string= "http://www.w3.org/2005/Atom" + ;; (string= "https://www.w3.org/2005/Atom" ;; (xml-get-attribute topnode 'xmlns))) (setq image-url (newsticker--get-logo-url-atom-1.0 topnode)) (setq icon-url (newsticker--get-icon-url-atom-1.0 topnode)) diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index 6329e7660f..535122a31f 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el @@ -54,7 +54,7 @@ ;; as well as the following Atom formats: ;; * Atom 0.3 ;; * Atom 1.0 -;; (see http://www.ietf.org/internet-drafts/draft-ietf-atompub-format-11.txt) +;; (see https://www.ietf.org/internet-drafts/draft-ietf-atompub-format-11.txt) ;; That makes Newsticker.el an "Atom aggregator, "RSS reader", "RSS ;; aggregator", and "Feed Reader". diff --git a/lisp/net/puny.el b/lisp/net/puny.el index cc406076c5..5c58fe02cb 100644 --- a/lisp/net/puny.el +++ b/lisp/net/puny.el @@ -23,7 +23,7 @@ ;;; Commentary: ;; Written by looking at -;; http://stackoverflow.com/questions/183485/can-anyone-recommend-a-good-free-javascript-for-punycode-to-unicode-conversion +;; https://stackoverflow.com/questions/183485/can-anyone-recommend-a-good-free-javascript-for-punycode-to-unicode-conversion ;;; Code: @@ -196,12 +196,12 @@ For instance \"xn--bcher-kva\" => \"bücher\"." (cl-incf i))) (buffer-string))) -;; http://www.unicode.org/reports/tr39/#Restriction_Level_Detection -;; http://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Inclusion_in_Identifiers +;; https://www.unicode.org/reports/tr39/#Restriction_Level_Detection +;; https://www.unicode.org/reports/tr31/#Table_Candidate_Characters_for_Inclusion_in_Identifiers (defun puny-highly-restrictive-string-p (string) "Say whether STRING is \"highly restrictive\" in the Unicode IDNA sense. -See http://www.unicode.org/reports/tr39/#Restriction_Level_Detection +See https://www.unicode.org/reports/tr39/#Restriction_Level_Detection for details. The main idea is that if you're mixing scripts (like latin and cyrillic), you may confuse the user by using homographs." diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index 10d061fba2..dc1b468a11 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el @@ -23,7 +23,7 @@ ;;; Commentary: ;; This package provides an implementation of the Secret Service API -;; . +;; . ;; This API is meant to make GNOME-Keyring- and KWallet-like daemons ;; available under a common D-BUS interface and thus increase ;; interoperability between GNOME, KDE and other applications having diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index f07d214e12..504304f385 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -2078,7 +2078,7 @@ This is a specialization of `soap-decode-type' for soap-headers ; list of (message part use) soap-body ; message parts present in the body use ; 'literal or 'encoded, see - ; http://www.w3.org/TR/wsdl#_soap:body + ; https://www.w3.org/TR/wsdl#_soap:body ) (cl-defstruct (soap-binding (:include soap-element)) @@ -2111,7 +2111,7 @@ This is a specialization of `soap-decode-type' for ;; Add the XSD types to the wsdl document (let ((ns (soap-make-xs-basic-types - "http://www.w3.org/2001/XMLSchema" "xsd"))) + "https://www.w3.org/2001/XMLSchema" "xsd"))) (soap-wsdl-add-namespace ns wsdl) (soap-wsdl-add-alias "xsd" (soap-namespace-name ns) wsdl)) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index a51edae148..377f45c175 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4408,7 +4408,7 @@ process to set up. VEC specifies the connection." ;; IRIX64 bash expands "!" even when in single quotes. This ;; destroys our shell functions, we must disable it. See - ;; . + ;; . (when (string-match-p "^IRIX64" uname) (tramp-send-command vec "set +H" t)) diff --git a/lisp/obsolete/erc-hecomplete.el b/lisp/obsolete/erc-hecomplete.el index 8f554282ae..cd26edeaa2 100644 --- a/lisp/obsolete/erc-hecomplete.el +++ b/lisp/obsolete/erc-hecomplete.el @@ -4,7 +4,7 @@ ;; Inc. ;; Author: Alex Schroeder -;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion +;; URL: https://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion ;; Obsolete-since: 24.1 ;; This file is part of GNU Emacs. diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el index 5bf9e2beee..49886e292e 100644 --- a/lisp/org/ob-plantuml.el +++ b/lisp/org/ob-plantuml.el @@ -26,7 +26,7 @@ ;; Org-Babel support for evaluating plantuml script. ;; ;; Inspired by Ian Yang's org-export-blocks-format-plantuml -;; http://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el +;; https://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el ;;; Requirements: diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el index 90956271cf..1b8088eaee 100644 --- a/lisp/org/ob-ruby.el +++ b/lisp/org/ob-ruby.el @@ -30,10 +30,10 @@ ;; - ruby and irb executables :: http://www.ruby-lang.org/ ;; ;; - ruby-mode :: Can be installed through ELPA, or from -;; http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el +;; https://github.com/eschulte/rinari/raw/master/util/ruby-mode.el ;; ;; - inf-ruby mode :: Can be installed through ELPA, or from -;; http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el +;; https://github.com/eschulte/rinari/raw/master/util/inf-ruby.el ;;; Code: (require 'ob) diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el index 60c081dcb3..c101574696 100644 --- a/lisp/org/ob-sass.el +++ b/lisp/org/ob-sass.el @@ -35,7 +35,7 @@ ;;; Requirements: -;; - sass-mode :: http://github.com/nex3/haml/blob/master/extra/sass-mode.el +;; - sass-mode :: https://github.com/nex3/haml/blob/master/extra/sass-mode.el ;;; Code: (require 'ob) diff --git a/lisp/org/ob-stan.el b/lisp/org/ob-stan.el index c563a6c3e5..678047c800 100644 --- a/lisp/org/ob-stan.el +++ b/lisp/org/ob-stan.el @@ -41,7 +41,7 @@ ;; For more information and usage examples, visit ;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html ;; -;; [1] http://mc-stan.org/ +;; [1] https://mc-stan.org/ ;;; Code: (require 'ob) diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index abba29952e..5c37cb1af5 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -6122,7 +6122,7 @@ which will prompt for the width." ;; Here are two examples of different styles. ;; Unicode block characters are used to give a smooth effect. -;; See http://en.wikipedia.org/wiki/Block_Elements +;; See https://en.wikipedia.org/wiki/Block_Elements ;; Use one of those drawing functions ;; - orgtbl-ascii-draw (the default ascii) ;; - orgtbl-uc-draw-grid (unicode with a grid effect) @@ -6136,7 +6136,7 @@ which will prompt for the width." It is a variant of orgtbl-ascii-draw with Unicode block characters, for a smooth display. Bars appear as grids (to the extent the font allows)." - ;; http://en.wikipedia.org/wiki/Block_Elements + ;; https://en.wikipedia.org/wiki/Block_Elements ;; best viewed with the "DejaVu Sans Mono" font. (orgtbl-ascii-draw value min max width " \u258F\u258E\u258D\u258C\u258B\u258A\u2589")) diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 797efb90b7..2f8fd0c645 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -5459,7 +5459,7 @@ transcoding it." (apostrophe :utf-8 "’" :html "’")) ("da" ;; one may use: »...«, "...", ›...‹, or '...'. - ;; http://sproget.dk/raad-og-regler/retskrivningsregler/retskrivningsregler/a7-40-60/a7-58-anforselstegn/ + ;; https://sproget.dk/raad-og-regler/retskrivningsregler/retskrivningsregler/a7-40-60/a7-58-anforselstegn/ ;; LaTeX quotes require Babel! (primary-opening :utf-8 "»" :html "»" :latex ">>" :texinfo "@guillemetright{}") @@ -5553,7 +5553,7 @@ transcoding it." (secondary-closing :utf-8 "’" :html "’" :latex "'" :texinfo "'") (apostrophe :utf-8 "’" :html "’")) ("ru" - ;; http://ru.wikipedia.org/wiki/%D0%9A%D0%B0%D0%B2%D1%8B%D1%87%D0%BA%D0%B8#.D0.9A.D0.B0.D0.B2.D1.8B.D1.87.D0.BA.D0.B8.2C_.D0.B8.D1.81.D0.BF.D0.BE.D0.BB.D1.8C.D0.B7.D1.83.D0.B5.D0.BC.D1.8B.D0.B5_.D0.B2_.D1.80.D1.83.D1.81.D1.81.D0.BA.D0.BE.D0.BC_.D1.8F.D0.B7.D1.8B.D0.BA.D0.B5 + ;; https://ru.wikipedia.org/wiki/%D0%9A%D0%B0%D0%B2%D1%8B%D1%87%D0%BA%D0%B8#.D0.9A.D0.B0.D0.B2.D1.8B.D1.87.D0.BA.D0.B8.2C_.D0.B8.D1.81.D0.BF.D0.BE.D0.BB.D1.8C.D0.B7.D1.83.D0.B5.D0.BC.D1.8B.D0.B5_.D0.B2_.D1.80.D1.83.D1.81.D1.81.D0.BA.D0.BE.D0.BC_.D1.8F.D0.B7.D1.8B.D0.BA.D0.B5 ;; http://www.artlebedev.ru/kovodstvo/sections/104/ (primary-opening :utf-8 "«" :html "«" :latex "{}<<" :texinfo "@guillemetleft{}") diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el index 9d346cfbd2..13de4b65e5 100644 --- a/lisp/pcmpl-unix.el +++ b/lisp/pcmpl-unix.el @@ -148,7 +148,7 @@ documentation), this function returns nil." ;; ssh support by Phil Hagelberg. -;; http://www.emacswiki.org/cgi-bin/wiki/pcmpl-ssh.el +;; https://www.emacswiki.org/cgi-bin/wiki/pcmpl-ssh.el (defun pcmpl-ssh-known-hosts () "Return a list of hosts found in `pcmpl-ssh-known-hosts-file'." diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el index 903c068606..d512a718b4 100644 --- a/lisp/play/bubbles.el +++ b/lisp/play/bubbles.el @@ -28,7 +28,7 @@ ;; possible in as few moves as possible. ;; Bubbles is an implementation of the "Same Game", similar to "Same -;; GNOME" and many others, see . +;; GNOME" and many others, see . ;; Installation ;; ------------ diff --git a/lisp/printing.el b/lisp/printing.el index 86a2434c0d..ec67a144c3 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre ;; Keywords: wp, print, PostScript ;; Version: 6.9.3 -;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; X-URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre (defconst pr-version "6.9.3" "printing.el, v 6.9.3 <2007/12/09 vinicius> @@ -64,7 +64,7 @@ Please send all bug fixes and enhancements to ;; interface to ps-print package and it also provides some extra stuff. ;; ;; To download the latest ps-print package see -;; `http://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage'. +;; `https://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage'. ;; Please, see README file for ps-print installation instructions. ;; ;; `printing' was inspired by: @@ -944,8 +944,8 @@ Please send all bug fixes and enhancements to ;; ;; * For `printing' package: ;; -;; printing `http://www.emacswiki.org/cgi-bin/emacs/download/printing.el' -;; ps-print `http://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage' +;; printing `https://www.emacswiki.org/cgi-bin/emacs/download/printing.el' +;; ps-print `https://www.emacswiki.org/cgi-bin/wiki/PsPrintPackage' ;; ;; * For GNU or Unix system: ;; diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el index 87e88163ac..98e58be230 100644 --- a/lisp/progmodes/bat-mode.el +++ b/lisp/progmodes/bat-mode.el @@ -42,7 +42,7 @@ ;; See documentation of function `bat-mode'. ;; ;; Separate package `dos-indent' (Matthew Fidler) provides rudimentary -;; indentation, see http://www.emacswiki.org/emacs/dos-indent.el. +;; indentation, see https://www.emacswiki.org/emacs/dos-indent.el. ;; ;; Acknowledgements: ;; diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index c62fbab059..2e4b9d4693 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -33,7 +33,7 @@ ;; support. ;; The latest version is available from -;; http://github.com/jrockway/cperl-mode +;; https://github.com/jrockway/cperl-mode ;; ;; (perhaps in the moosex-declare branch) diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el index bf9b0e961b..be82c72910 100644 --- a/lisp/progmodes/ebnf-abn.el +++ b/lisp/progmodes/ebnf-abn.el @@ -38,7 +38,7 @@ ;; ----------- ;; ;; See the URL: -;; `http://www.ietf.org/rfc/rfc2234.txt' +;; `https://www.ietf.org/rfc/rfc2234.txt' ;; or ;; `http://www.faqs.org/rfcs/rfc2234.html' ;; or diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el index bdebf0db2c..ddddb27a11 100644 --- a/lisp/progmodes/ebnf-dtd.el +++ b/lisp/progmodes/ebnf-dtd.el @@ -38,11 +38,11 @@ ;; ---------- ;; ;; See the URLs: -;; `http://www.w3.org/TR/2004/REC-xml-20040204/' +;; `https://www.w3.org/TR/2004/REC-xml-20040204/' ;; (Extensible Markup Language (XML) 1.0 (Third Edition)) -;; `http://www.w3.org/TR/html40/' +;; `https://www.w3.org/TR/html40/' ;; (HTML 4.01 Specification) -;; `http://www.w3.org/TR/NOTE-html-970421' +;; `https://www.w3.org/TR/NOTE-html-970421' ;; (HTML DTD with support for Style Sheets) ;; ;; diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el index 20e2d4ca31..546f1f8a87 100644 --- a/lisp/progmodes/ebnf-ebx.el +++ b/lisp/progmodes/ebnf-ebx.el @@ -38,7 +38,7 @@ ;; ------------ ;; ;; See the URL: -;; `http://www.w3.org/TR/2004/REC-xml-20040204/#sec-notation' +;; `https://www.w3.org/TR/2004/REC-xml-20040204/#sec-notation' ;; (Extensible Markup Language (XML) 1.0 (Third Edition)) ;; ;; diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index 22c70bf734..991cd6fc51 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre ;; Keywords: wp, ebnf, PostScript ;; Version: 4.4 -;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; X-URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre ;; This file is part of GNU Emacs. @@ -326,7 +326,7 @@ Please send all bug fixes and enhancements to ;; `ebnf-lex-comment-char' and `ebnf-lex-eop-char'. ;; ;; `abnf' ebnf2ps recognizes the syntax described in the URL: -;; `http://www.ietf.org/rfc/rfc2234.txt' +;; `https://www.ietf.org/rfc/rfc2234.txt' ;; ("Augmented BNF for Syntax Specifications: ABNF"). ;; ;; `iso-ebnf' ebnf2ps recognizes the syntax described in the URL: @@ -342,11 +342,11 @@ Please send all bug fixes and enhancements to ;; `ebnf-yac-ignore-error-recovery'. ;; ;; `ebnfx' ebnf2ps recognizes the syntax described in the URL: -;; `http://www.w3.org/TR/2004/REC-xml-20040204/#sec-notation' +;; `https://www.w3.org/TR/2004/REC-xml-20040204/#sec-notation' ;; ("Extensible Markup Language (XML) 1.0 (Third Edition)") ;; ;; `dtd' ebnf2ps recognizes the syntax described in the URL: -;; `http://www.w3.org/TR/2004/REC-xml-20040204/' +;; `https://www.w3.org/TR/2004/REC-xml-20040204/' ;; ("Extensible Markup Language (XML) 1.0 (Third Edition)") ;; ;; Any other value is treated as `ebnf'. @@ -1779,7 +1779,7 @@ Valid values are: `ebnf-lex-comment-char' and `ebnf-lex-eop-char'. `abnf' ebnf2ps recognizes the syntax described in the URL: - `http://www.ietf.org/rfc/rfc2234.txt' + `https://www.ietf.org/rfc/rfc2234.txt' (\"Augmented BNF for Syntax Specifications: ABNF\"). `iso-ebnf' ebnf2ps recognizes the syntax described in the URL: @@ -1795,11 +1795,11 @@ Valid values are: `ebnf-yac-ignore-error-recovery'. `ebnfx' ebnf2ps recognizes the syntax described in the URL: - `http://www.w3.org/TR/2004/REC-xml-20040204/#sec-notation' + `https://www.w3.org/TR/2004/REC-xml-20040204/#sec-notation' (\"Extensible Markup Language (XML) 1.0 (Third Edition)\") `dtd' ebnf2ps recognizes the syntax described in the URL: - `http://www.w3.org/TR/2004/REC-xml-20040204/' + `https://www.w3.org/TR/2004/REC-xml-20040204/' (\"Extensible Markup Language (XML) 1.0 (Third Edition)\") Any other value is treated as `ebnf'." diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el index 62f6d1aaea..152dc725c7 100644 --- a/lisp/progmodes/flymake-proc.el +++ b/lisp/progmodes/flymake-proc.el @@ -37,7 +37,7 @@ ;;; Bugs/todo: ;; - Only uses "Makefile", not "makefile" or "GNUmakefile" -;; (from http://bugs.debian.org/337339). +;; (from https://bugs.debian.org/337339). ;;; Code: diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 086f0b6a08..79df97080d 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -8,7 +8,7 @@ ;; This file is part of GNU Emacs. -;; Homepage: http://www.emacswiki.org/emacs/GDB-MI +;; Homepage: https://www.emacswiki.org/emacs/GDB-MI ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 84c473ddb7..81021bc64f 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1845,7 +1845,7 @@ and source-file directory for your debugger." ;; JDB command will get out of the debugger. There is some truly ;; pathetic JDB documentation available at: ;; -;; http://java.sun.com/products/jdk/1.1/debugging/ +;; https://java.sun.com/products/jdk/1.1/debugging/ ;; ;; KNOWN PROBLEMS AND FIXME's: ;; diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el index b0542a99da..3bc3971f5e 100644 --- a/lisp/progmodes/idlw-complete-structtag.el +++ b/lisp/progmodes/idlw-complete-structtag.el @@ -49,7 +49,7 @@ ;; ;; New versions of IDLWAVE, documentation, and more information available ;; from: -;; http://github.com/jdtsmith/idlwave +;; https://github.com/jdtsmith/idlwave ;; ;; INSTALLATION ;; ============ diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index ec4fd58886..2d4ea465c4 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -32,7 +32,7 @@ ;; along with new versions of IDLWAVE, documentation, and more ;; information, at: ;; -;; http://github.com/jdtsmith/idlwave +;; https://github.com/jdtsmith/idlwave ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 99ac0877c8..38127fccbc 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -40,7 +40,7 @@ ;; ;; New versions of IDLWAVE, documentation, and more information ;; available from: -;; http://github.com/jdtsmith/idlwave +;; https://github.com/jdtsmith/idlwave ;; ;; INSTALLATION: ;; ============= @@ -58,7 +58,7 @@ ;; The newest version of this file can be found on the maintainers ;; web site. ;; -;; http://github.com/jdtsmith/idlwave +;; https://github.com/jdtsmith/idlwave ;; ;; DOCUMENTATION ;; ============= @@ -896,7 +896,7 @@ IDL has currently stepped.") Info documentation for this package is available. Use \\[idlwave-info] to display (complain to your sysadmin if that does not work). For PostScript and HTML versions of the documentation, check IDLWAVE's - homepage at URL `http://github.com/jdtsmith/idlwave'. + homepage at URL `https://github.com/jdtsmith/idlwave'. IDLWAVE has customize support - see the group `idlwave'. 8. Keybindings diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el index 23c129c1af..1866e50d68 100644 --- a/lisp/progmodes/idlw-toolbar.el +++ b/lisp/progmodes/idlw-toolbar.el @@ -29,7 +29,7 @@ ;; New versions of IDLWAVE, documentation, and more information ;; available from: -;; http://github.com/jdtsmith/idlwave +;; https://github.com/jdtsmith/idlwave ;;; Code: diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 121f5d6304..86f9f33672 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -44,7 +44,7 @@ ;; ;; New versions of IDLWAVE, documentation, and more information ;; available from: -;; http://github.com/jdtsmith/idlwave +;; https://github.com/jdtsmith/idlwave ;; ;; INSTALLATION ;; ============ @@ -64,7 +64,7 @@ ;; The newest version of this file is available from the maintainer's ;; Webpage: ;; -;; http://github.com/jdtsmith/idlwave +;; https://github.com/jdtsmith/idlwave ;; ;; DOCUMENTATION ;; ============= @@ -164,7 +164,7 @@ "Major mode for editing IDL .pro files." :tag "IDLWAVE" :link '(url-link :tag "Home Page" - "http://github.com/jdtsmith/idlwave") + "https://github.com/jdtsmith/idlwave") :link '(emacs-commentary-link :tag "Commentary in idlw-shell.el" "idlw-shell.el") :link '(emacs-commentary-link :tag "Commentary in idlwave.el" "idlwave.el") @@ -1846,7 +1846,7 @@ The main features of this mode are \\[idlwave-info] to display (complain to your sysadmin if that does not work). For Postscript, PDF, and HTML versions of the documentation, check IDLWAVE's homepage at URL - `http://github.com/jdtsmith/idlwave'. + `https://github.com/jdtsmith/idlwave'. IDLWAVE has customize support - see the group `idlwave'. 10.Keybindings diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index a11634bc9f..14f00597bf 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -4,7 +4,7 @@ ;; Authors: Yukihiro Matsumoto ;; Nobuyoshi Nakada -;; URL: http://www.emacswiki.org/cgi-bin/wiki/RubyMode +;; URL: https://www.emacswiki.org/cgi-bin/wiki/RubyMode ;; Created: Fri Feb 4 14:49:13 JST 1994 ;; Keywords: languages ruby ;; Version: 1.2 diff --git a/lisp/ps-def.el b/lisp/ps-def.el index 65e8011f77..571e1a68c5 100644 --- a/lisp/ps-def.el +++ b/lisp/ps-def.el @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre ;; Kenichi Handa (multi-byte characters) ;; Keywords: wp, print, PostScript -;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; X-URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre ;; Package: ps-print ;; This file is part of GNU Emacs. diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 67ee4d2439..26029a16d7 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -9,7 +9,7 @@ ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, print, PostScript ;; Version: 7.3.5 -;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; X-URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre (eval-when-compile (require 'cl-lib)) diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el index 7c688d53fa..9489f4f911 100644 --- a/lisp/ps-samp.el +++ b/lisp/ps-samp.el @@ -8,7 +8,7 @@ ;; Kenichi Handa (multi-byte characters) ;; Maintainer: Vinicius Jose Latorre ;; Keywords: wp, print, PostScript -;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; X-URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre ;; Package: ps-print ;; This file is part of GNU Emacs. diff --git a/lisp/subr.el b/lisp/subr.el index 2dc23a479e..23e4dcfa7e 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3251,7 +3251,7 @@ See Info node `(elisp)Security Considerations'." ;; First, quote argument so that CommandLineToArgvW will ;; understand it. See - ;; http://msdn.microsoft.com/en-us/library/17w5ykft%28v=vs.85%29.aspx + ;; https://msdn.microsoft.com/en-us/library/17w5ykft%28v=vs.85%29.aspx ;; After we perform that level of quoting, escape shell ;; metacharacters so that cmd won't mangle our argument. If the ;; argument contains no double quote characters, we can just diff --git a/lisp/tempo.el b/lisp/tempo.el index c2280dedc8..a720ff7901 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -75,7 +75,7 @@ ;; ftp.lysator.liu.se in the directory /pub/emacs ;; There is also a WWW page at -;; http://www.lysator.liu.se/~davidk/elisp/ which has some information +;; https://www.lysator.liu.se/~davidk/elisp/ which has some information ;;; Known bugs: diff --git a/lisp/term/internal.el b/lisp/term/internal.el index 5e22c0f6af..c54481a532 100644 --- a/lisp/term/internal.el +++ b/lisp/term/internal.el @@ -400,9 +400,9 @@ If TABLE is nil or omitted, `standard-display-table' is used." ;; The following alist was compiled from: ;; ;; Ralf Brown's Interrupt List. file INTERRUP.F, D-2138, Table 01400 -;; http://www.ethnologue.com/country_index.asp (official languages) -;; http://unicode.org/onlinedat/languages.html -;; http://unicode.org/onlinedat/countries.html +;; https://www.ethnologue.com/country_index.asp (official languages) +;; https://unicode.org/onlinedat/languages.html +;; https://unicode.org/onlinedat/countries.html ;; ;; Only the official languages listed for each country. ;; diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 03edd4703e..0d1eeed561 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -100,7 +100,7 @@ "Identifiers for types of media.") (defconst css-property-alist - ;; CSS 2.1 properties (http://www.w3.org/TR/CSS21/propidx.html). + ;; CSS 2.1 properties (https://www.w3.org/TR/CSS21/propidx.html). ;; ;; Properties duplicated by any of the CSS3 modules below have been ;; removed. @@ -190,7 +190,7 @@ ("z-index" "auto" integer) ;; CSS Animations - ;; (http://www.w3.org/TR/css3-animations/#property-index) + ;; (https://www.w3.org/TR/css3-animations/#property-index) ("animation" single-animation-name time single-timing-function single-animation-iteration-count single-animation-direction single-animation-fill-mode single-animation-play-state) @@ -204,7 +204,7 @@ ("animation-timing-function" single-timing-function) ;; CSS Backgrounds and Borders Module Level 3 - ;; (http://www.w3.org/TR/css3-background/#property-index) + ;; (https://www.w3.org/TR/css3-background/#property-index) ("background" bg-layer final-bg-layer) ("background-attachment" attachment) ("background-clip" box) @@ -249,7 +249,7 @@ ("box-shadow" "none" shadow) ;; CSS Basic User Interface Module Level 3 (CSS3 UI) - ;; (http://www.w3.org/TR/css3-ui/#property-index) + ;; (https://www.w3.org/TR/css3-ui/#property-index) ("box-sizing" "content-box" "border-box") ("caret-color" "auto" color) ("cursor" uri x y "auto" "default" "none" "context-menu" "help" @@ -272,7 +272,7 @@ ("text-overflow" "clip" "ellipsis" string) ;; CSS Color Module Level 3 - ;; (http://www.w3.org/TR/css3-color/#property) + ;; (https://www.w3.org/TR/css3-color/#property) ("color" color) ("opacity" alphavalue) @@ -304,7 +304,7 @@ ("grid-template-rows" "none" track-list auto-track-list) ;; CSS Flexible Box Layout Module Level 1 - ;; (http://www.w3.org/TR/css-flexbox-1/#property-index) + ;; (https://www.w3.org/TR/css-flexbox-1/#property-index) ("align-content" "flex-start" "flex-end" "center" "space-between" "space-around" "stretch") ("align-items" "flex-start" "flex-end" "center" "baseline" @@ -323,7 +323,7 @@ ("order" integer) ;; CSS Fonts Module Level 3 - ;; (http://www.w3.org/TR/css3-fonts/#property-index) + ;; (https://www.w3.org/TR/css3-fonts/#property-index) ("font" font-style font-variant-css21 font-weight font-stretch font-size line-height font-family "caption" "icon" "menu" "message-box" "small-caption" "status-bar") @@ -419,7 +419,7 @@ ("columns" column-width column-count) ;; CSS Overflow Module Level 3 - ;; (http://www.w3.org/TR/css-overflow-3/#property-index) + ;; (https://www.w3.org/TR/css-overflow-3/#property-index) ("max-lines" "none" integer) ("overflow" "visible" "hidden" "scroll" "auto" "paged-x" "paged-y" "paged-x-controls" "paged-y-controls" "fragments") @@ -448,7 +448,7 @@ ("text-underline-position" "auto" "under" "left" "right") ;; CSS Text Module Level 3 - ;; (http://www.w3.org/TR/css3-text/#property-index) + ;; (https://www.w3.org/TR/css3-text/#property-index) ("hanging-punctuation" "none" "first" "force-end" "allow-end" "last") ("hyphens" "none" "manual" "auto") @@ -470,7 +470,7 @@ ("word-wrap" "normal" "break-word") ;; CSS Transforms Module Level 1 - ;; (http://www.w3.org/TR/css3-2d-transforms/#property-index) + ;; (https://www.w3.org/TR/css3-2d-transforms/#property-index) ("backface-visibility" "visible" "hidden") ("perspective" "none" length) ("perspective-origin" "left" "center" "right" "top" "bottom" @@ -481,7 +481,7 @@ ("transform-style" "flat" "preserve-3d") ;; CSS Transitions - ;; (http://www.w3.org/TR/css3-transitions/#property-index) + ;; (https://www.w3.org/TR/css3-transitions/#property-index) ("transition" single-transition) ("transition-delay" time) ("transition-duration" time) @@ -503,7 +503,7 @@ ("writing-mode" "horizontal-tb" "vertical-rl" "vertical-lr") ;; Filter Effects Module Level 1 - ;; (http://www.w3.org/TR/filter-effects/#property-index) + ;; (https://www.w3.org/TR/filter-effects/#property-index) ("color-interpolation-filters" "auto" "sRGB" "linearRGB") ("filter" "none" filter-function-list) ("flood-color" color) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 936edf17ac..25aa58046f 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -2929,7 +2929,7 @@ buffer, and leaves the previous contents of the buffer untouched. References used for this implementation: HTML: - URL `http://www.w3.org' + URL `https://www.w3.org' LaTeX: URL `http://www.maths.tcd.ie/~dwilkins/LaTeXPrimer/Tables.html' diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index 3c2d766ffb..558a3fd736 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -278,7 +278,7 @@ If nil, construct the regexp from `thing-at-point-uri-schemes'.") "Regexp matching a URI without a scheme component.") (defvar thing-at-point-uri-schemes - ;; Officials from http://www.iana.org/assignments/uri-schemes.html + ;; Officials from https://www.iana.org/assignments/uri-schemes.html '("aaa://" "about:" "acap://" "apt:" "bzr://" "bzr+ssh://" "attachment:/" "chrome://" "cid:" "content://" "crid://" "cvs://" "data:" "dav:" "dict://" "doi:" "dns:" "dtn:" "feed:" "file:/" diff --git a/lisp/thumbs.el b/lisp/thumbs.el index dd259ec1ff..3aa7ff0836 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -30,7 +30,7 @@ ;; your images, use image-dired.el ;; ;; The 'convert' program from 'ImageMagick' -;; [URL:http://www.imagemagick.org/] is required. +;; [URL:https://www.imagemagick.org/] is required. ;; ;; Thanks: Alex Schroeder for maintaining the package at some ;; time. The peoples at #emacs@freenode.net for numerous help. RMS diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index f2044617b9..8f39b5ae01 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el @@ -39,7 +39,7 @@ ;;; ------------------------ ;;; This implements the BASIC authorization type. See the online ;;; documentation at -;;; http://www.w3.org/hypertext/WWW/AccessAuthorization/Basic.html +;;; https://www.w3.org/hypertext/WWW/AccessAuthorization/Basic.html ;;; for the complete documentation on this type. ;;; ;;; This is very insecure, but it works as a proof-of-concept diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el index 03a3b37f39..9647df1c13 100644 --- a/lisp/url/url-irc.el +++ b/lisp/url/url-irc.el @@ -22,7 +22,7 @@ ;;; Commentary: ;; IRC URLs are defined in -;; http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt +;; https://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt ;;; Code: diff --git a/lisp/url/url.el b/lisp/url/url.el index 321e79c019..33a5ebcdcc 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -24,7 +24,7 @@ ;;; Commentary: -;; Registered URI schemes: http://www.iana.org/assignments/uri-schemes +;; Registered URI schemes: https://www.iana.org/assignments/uri-schemes ;;; Code: diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 2e05d93bf5..669057811a 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre ;; Keywords: data, wp ;; Version: 13.2.2 -;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre +;; X-URL: https://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre ;; This file is part of GNU Emacs. diff --git a/lisp/xml.el b/lisp/xml.el index 236d9cbe6c..c96ff80446 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -655,7 +655,7 @@ Leave point at the first non-blank character after the tag." (setq name (xml-maybe-do-ns (match-string-no-properties 1) nil xml-ns)) (goto-char end-pos) - ;; See also: http://www.w3.org/TR/2000/REC-xml-20001006#AVNormalize + ;; See also: https://www.w3.org/TR/2000/REC-xml-20001006#AVNormalize ;; Do we have a string between quotes (or double-quotes), ;; or a simple word ? commit 379c0592632e3ddb3f2ce454d80ee05a643b1541 Author: Stefan Kangas Date: Thu Oct 1 15:18:43 2020 +0200 Remove some obsolete URLs * lisp/net/newst-backend.el (newsticker--raw-url-list-defaults): Remove some obsolete URLs. diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index b8f1bccd78..2c32a2cf2e 100644 --- a/lisp/net/newst-backend.el +++ b/lisp/net/newst-backend.el @@ -68,9 +68,6 @@ considered to be running if the newsticker timer list is not empty." ;; Hard-coding URLs like this is a recipe for propagating obsolete info. (defconst newsticker--raw-url-list-defaults '( - ;; 2017/12: no response. -;;; ("CNET News.com" -;;; "http://export.cnet.com/export/feeds/news/rss/1,11176,,00.xml") ("Debian Security Advisories" "http://www.debian.org/security/dsa.en.rdf") ("Debian Security Advisories - Long format" @@ -81,11 +78,6 @@ considered to be running if the newsticker timer list is not empty." 3600) ("LWN (Linux Weekly News)" "https://lwn.net/headlines/rss") - ;; Not updated since 2010. -;;; ("NY Times: Technology" -;;; "http://www.nytimes.com/services/xml/rss/userland/Technology.xml") -;;; ("NY Times" -;;; "http://www.nytimes.com/services/xml/rss/userland/HomePage.xml") ("Quote of the day" "http://feeds.feedburner.com/quotationspage/qotd" "07:00" commit b03f74e0f2a578b1580e8b1c368665850ee7f808 Author: Stefan Kangas Date: Wed Sep 30 16:18:50 2020 +0200 Don't quote lambdas in several places * admin/find-gc.el (find-gc-unsafe): * lisp/align.el (align-rules-list): * lisp/comint.el (comint-arguments): * lisp/double.el (isearch-mode-map): * lisp/ehelp.el (electric-help-command-loop): * lisp/emacs-lisp/cl-macs.el (cl-defstruct): * lisp/emulation/cua-rect.el (cua--copy-rectangle-as-kill) (cua-copy-rectangle-as-text): * lisp/eshell/esh-var.el (eshell-parse-variable-ref): * lisp/hexl.el (hexl-insert-multibyte-char): * lisp/international/titdic-cnv.el (tsang-quick-converter) (ziranma-converter): * lisp/language/tibet-util.el (tibetan-decompose-precomposition-alist): * lisp/mail/mailalias.el (mail-get-names): * lisp/mh-e/mh-e.el (mh-auto-fields-list, mh-identity-default): * lisp/mouse.el (mouse-buffer-menu-map, mouse-buffer-menu-alist): * lisp/play/gametree.el (gametree-make-heading-function): * lisp/shell.el (shell--command-completion-data): * lisp/talk.el (talk-update-buffers): * lisp/tempo.el (tempo-insert-template, tempo-is-user-element) (tempo-build-collection): * lisp/term.el (term-input-filter, term-pager-help): * lisp/textmodes/table.el (table-delete-column): * lisp/url/url-cache.el (url-cache-create-filename-human-readable): * lisp/textmodes/tex-mode.el (latex-imenu-create-index): Don't quote lambdas. diff --git a/admin/find-gc.el b/admin/find-gc.el index 9bab3776a5..7de2474b82 100644 --- a/admin/find-gc.el +++ b/admin/find-gc.el @@ -73,8 +73,8 @@ Also store it in `find-gc-unsafe-list'." (find-unsafe-funcs 'Fgarbage_collect) (setq find-gc-unsafe-list (sort find-gc-unsafe-list - (function (lambda (x y) - (string-lessp (car x) (car y))))))) + (lambda (x y) + (string-lessp (car x) (car y)))))) ;;; This does a depth-first search to find all functions that can ;;; ultimately call the function "target". The result is an a-list diff --git a/lisp/align.el b/lisp/align.el index 61387b23dc..e3bdf77002 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -389,7 +389,7 @@ The possible settings for `align-region-separate' are: (regexp . "\\(^\\s-+[^( \t\n]\\|(\\(\\S-+\\)\\s-+\\)\\S-+\\(\\s-+\\)") (group . 3) (modes . align-lisp-modes) - (run-if . ,(function (lambda () current-prefix-arg)))) + (run-if . ,(lambda () current-prefix-arg))) (lisp-alist-dot (regexp . "\\(\\s-*\\)\\.\\(\\s-*\\)") @@ -463,7 +463,7 @@ The possible settings for `align-region-separate' are: (regexp . ",\\(\\s-*\\)[^/ \t\n]") (repeat . t) (modes . align-c++-modes) - (run-if . ,(function (lambda () current-prefix-arg)))) + (run-if . ,(lambda () current-prefix-arg))) ; (valid ; . ,(function ; (lambda () @@ -480,7 +480,7 @@ The possible settings for `align-region-separate' are: (regexp . ",\\(\\s-*\\)[^# \t\n]") (repeat . t) (modes . (append align-perl-modes '(python-mode))) - (run-if . ,(function (lambda () current-prefix-arg)))) + (run-if . ,(lambda () current-prefix-arg))) (c++-comment (regexp . "\\(\\s-*\\)\\(//.*\\|/\\*.*\\*/\\s-*\\)$") diff --git a/lisp/comint.el b/lisp/comint.el index b966fae936..611947605f 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1773,7 +1773,7 @@ Argument 0 is the command name." ((>= mth 0) (1- (- count mth))) (t (1- (- mth)))))) (mapconcat - (function (lambda (a) a)) (nthcdr n (nreverse (nthcdr m args))) " ")))) + (lambda (a) a) (nthcdr n (nreverse (nthcdr m args))) " ")))) ;; ;; Input processing stuff diff --git a/lisp/double.el b/lisp/double.el index 639d041a1d..8e5090034c 100644 --- a/lisp/double.el +++ b/lisp/double.el @@ -99,7 +99,7 @@ but not `C-u X' or `ESC X' since the X is not the prefix key." (load-library "isearch")) (define-key isearch-mode-map [ignore] - (function (lambda () (interactive) (isearch-update)))) + (lambda () (interactive) (isearch-update))) (defun double-translate-key (prompt) ;; Translate input events using double map. diff --git a/lisp/ehelp.el b/lisp/ehelp.el index ad39116c68..81373202c5 100644 --- a/lisp/ehelp.el +++ b/lisp/ehelp.el @@ -219,7 +219,7 @@ BUFFER is put back into its original major mode." 'electric-help-retain)))) (Electric-command-loop 'exit - (function (lambda () + (lambda () (sit-for 0) ;necessary if last command was end-of-buffer or ;beginning-of-buffer - otherwise pos-visible-in-window-p ;will yield a wrong result. @@ -241,7 +241,7 @@ BUFFER is put back into its original major mode." (t (cond (standard "Press SPC to scroll, DEL to scroll back, q to exit, r to retain ") (both) - (t (setq both (substitute-command-keys "Press \\[scroll-up] to scroll, \\[scroll-down] to scroll back, \\[electric-help-exit] to exit, \\[electric-help-retain] to retain "))))))))) + (t (setq both (substitute-command-keys "Press \\[scroll-up] to scroll, \\[scroll-down] to scroll back, \\[electric-help-exit] to exit, \\[electric-help-retain] to retain ")))))))) t)))) diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 19cdbd7aeb..147a0a8f5a 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2969,7 +2969,7 @@ Supported keywords for slots are: constrs)) (pcase-dolist (`(,cname ,args ,doc) constrs) (let* ((anames (cl--arglist-args args)) - (make (cl-mapcar (function (lambda (s d) (if (memq s anames) s d))) + (make (cl-mapcar (lambda (s d) (if (memq s anames) s d)) slots defaults)) ;; `cl-defsubst' is fundamentally broken: it substitutes ;; its arguments into the body's `sexp' much too naively diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index d2c6dd06b6..9c3251e0e6 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -735,7 +735,7 @@ If command is repeated at same position, delete the rectangle." (setq cua--last-killed-rectangle (cons (and kill-ring (car kill-ring)) killed-rectangle)) (if ring (kill-new (mapconcat - (function (lambda (row) (concat row "\n"))) + (lambda (row) (concat row "\n")) killed-rectangle ""))))) (defun cua--activate-rectangle () @@ -1071,7 +1071,7 @@ The text previously in the rectangle is overwritten by the blanks." (cua--copy-rectangle-to-global-mark t)) (let* ((rect (cua--extract-rectangle)) (text (mapconcat - (function (lambda (row) (concat row "\n"))) + (lambda (row) (concat row "\n")) rect ""))) (setq arg (cua--prefix-arg arg)) (if cua--register diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index 96838d4132..7388279f15 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el @@ -463,8 +463,8 @@ Possible options are: (eshell-as-subcommand ,(eshell-parse-command cmd)) (ignore (nconc eshell-this-command-hook - (list (function (lambda () - (delete-file ,temp)))))) + (list (lambda () + (delete-file ,temp))))) (quote ,temp))) (goto-char (1+ end))))))) ((eq (char-after) ?\() diff --git a/lisp/hexl.el b/lisp/hexl.el index 38eca77e26..0c31d96457 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el @@ -886,7 +886,7 @@ and their encoded form is inserted byte by byte." (when (null encoded) (setq internal (encode-coding-string internal 'utf-8-emacs) internal-hex - (mapconcat (function (lambda (c) (format "%x" c))) + (mapconcat (lambda (c) (format "%x" c)) internal " ")) (if (yes-or-no-p (format-message @@ -899,7 +899,7 @@ and their encoded form is inserted byte by byte." (substitute-command-keys "try \\[hexl-insert-hex-string]")))) (while (> num 0) (mapc - (function (lambda (c) (hexl-insert-char c 1))) encoded) + (lambda (c) (hexl-insert-char c 1)) encoded) (setq num (1- num)))))))) (defun hexl-self-insert-command (arg) diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index a6dcd02dc6..2da8635f80 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -795,7 +795,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." (forward-line 1))) (maphash #'(lambda (key val) (setq dic (cons (cons key val) dic))) table))) - (setq dic (sort dic (function (lambda (x y) (string< (car x ) (car y)))))) + (setq dic (sort dic (lambda (x y) (string< (car x ) (car y))))) (dolist (elt dic) (insert (format "(%S\t%S)\n" (car elt) (cdr elt)))) (let ((punctuation '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B") @@ -956,7 +956,7 @@ method `chinese-tonepy' with which you must specify tones by digits (setq trans (mapconcat 'identity trans ""))))) (setq dic (cons (cons key trans) dic))) table))) - (setq dic (sort dic (function (lambda (x y) (string< (car x) (car y)))))) + (setq dic (sort dic (lambda (x y) (string< (car x) (car y))))) (goto-char (point-max)) (insert (format "%S\n" "$A::WVJdHk!K!>WTH;!?!K(B diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el index 8684cdb133..04369f6af8 100644 --- a/lisp/language/tibet-util.el +++ b/lisp/language/tibet-util.el @@ -275,7 +275,7 @@ The returned string has no composition information." (compose-region from to components))))))) (defvar tibetan-decompose-precomposition-alist - (mapcar (function (lambda (x) (cons (string-to-char (cdr x)) (car x)))) + (mapcar (lambda (x) (cons (string-to-char (cdr x)) (car x))) tibetan-precomposition-rule-alist)) ;;;###autoload diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 1f688734d4..2b76539e15 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -517,7 +517,7 @@ PREFIX is the string we want to complete." (setq mail-names (sort (append (if (consp mail-aliases) (mapcar - (function (lambda (a) (list (car a)))) + (lambda (a) (list (car a))) mail-aliases)) (if (consp mail-local-names) mail-local-names) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index dd05d691c9..e8a660aab2 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -1550,7 +1550,7 @@ as the result is undefined." ,(append '(radio) (mapcar - (function (lambda (arg) `(const ,arg))) + (lambda (arg) `(const ,arg)) (mapcar 'car mh-identity-list)))) (cons :tag "Fcc Field" (const "fcc") @@ -1577,7 +1577,7 @@ See `mh-identity-list'." :type (append '(radio) (cons '(const :tag "None" nil) - (mapcar (function (lambda (arg) `(const ,arg))) + (mapcar (lambda (arg) `(const ,arg)) (mapcar 'car mh-identity-list)))) :group 'mh-identity :package-version '(MH-E . "7.1")) diff --git a/lisp/mouse.el b/lisp/mouse.el index 06fdca12b9..9e7eee61e5 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -2206,8 +2206,8 @@ and selects that window." ;; Sort the list to put the most popular major modes first. (setq split-by-major-mode (sort split-by-major-mode - (function (lambda (elt1 elt2) - (> (length elt1) (length elt2)))))) + (lambda (elt1 elt2) + (> (length elt1) (length elt2))))) ;; Make a separate submenu for each major mode ;; that has more than one buffer, ;; unless all the remaining buffers are less than 1/10 of them. @@ -2248,8 +2248,8 @@ and selects that window." head) (setq buffers (sort buffers - (function (lambda (elt1 elt2) - (string< (buffer-name elt1) (buffer-name elt2)))))) + (lambda (elt1 elt2) + (string< (buffer-name elt1) (buffer-name elt2))))) (setq tail buffers) (while tail (or (eq ?\s (aref (buffer-name (car tail)) 0)) diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el index ba74afce29..a9417e9e0a 100644 --- a/lisp/play/gametree.el +++ b/lisp/play/gametree.el @@ -121,8 +121,8 @@ Has to contain \"%d\" to output the actual number." :group 'gametree) (defcustom gametree-make-heading-function - (function (lambda (level) - (insert (make-string level ?*)))) + (lambda (level) + (insert (make-string level ?*))) "A function of one numeric argument, LEVEL, to insert a heading at point. You should change this if you change `outline-regexp'." :type 'function diff --git a/lisp/shell.el b/lisp/shell.el index 6129e5efc8..226bdf4d91 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -1208,7 +1208,7 @@ Returns t if successful." (cwd (file-name-as-directory (expand-file-name default-directory))) (ignored-extensions (and comint-completion-fignore - (mapconcat (function (lambda (x) (concat (regexp-quote x) "\\'"))) + (mapconcat (lambda (x) (concat (regexp-quote x) "\\'")) comint-completion-fignore "\\|"))) (dir "") (comps-in-dir ()) (file "") (abs-file-name "") (completions ())) diff --git a/lisp/talk.el b/lisp/talk.el index 5541b0a4c6..a18cf26343 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -90,7 +90,7 @@ Each element has the form (DISPLAY FRAME BUFFER).") (let ((frame (nth 1 (car tail))) (this-buffer (nth 2 (car tail))) (buffers - (mapcar (function (lambda (elt) (nth 2 elt))) + (mapcar (lambda (elt) (nth 2 elt)) talk-display-alist))) ;; Put this display's own talk buffer ;; at the front of the list. diff --git a/lisp/tempo.el b/lisp/tempo.el index bc398e7eb6..c2280dedc8 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -306,8 +306,8 @@ mode, ON-REGION is ignored and assumed true if the region is active." (goto-char tempo-region-start)) (save-excursion (tempo-insert-mark (point-marker)) - (mapc (function (lambda (elt) - (tempo-insert elt on-region))) + (mapc (lambda (elt) + (tempo-insert elt on-region)) (symbol-value template)) (tempo-insert-mark (point-marker))) (tempo-forward-mark)) @@ -449,9 +449,9 @@ never prompted." "Tries all the user-defined element handlers in `tempo-user-elements'." ;; Sigh... I need (some list) (catch 'found - (mapc (function (lambda (handler) - (let ((result (funcall handler element))) - (if result (throw 'found result))))) + (mapc (lambda (handler) + (let ((result (funcall handler element))) + (if result (throw 'found result)))) tempo-user-elements) (throw 'found nil))) @@ -640,11 +640,11 @@ If `tempo-dirty-collection' is nil, the old collection is reused." tempo-collection) (setq tempo-collection (apply (function append) - (mapcar (function (lambda (tag-list) + (mapcar (lambda (tag-list) ; If the format for ; tempo-local-tags changes, ; change this - (eval (car tag-list)))) + (eval (car tag-list))) tempo-local-tags)))) (setq tempo-dirty-collection nil))) diff --git a/lisp/term.el b/lisp/term.el index 69681f706c..ff8b3f00f3 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -554,7 +554,7 @@ See also `term-dynamic-complete'. This is a good thing to set in mode hooks.") (defvar term-input-filter - (function (lambda (str) (not (string-match "\\`\\s *\\'" str)))) + (lambda (str) (not (string-match "\\`\\s *\\'" str))) "Predicate for filtering additions to input history. Only inputs answering true to this function are saved on the input history list. Default is to save anything that isn't all whitespace.") @@ -3640,8 +3640,8 @@ The top-most line is line 0." (message "Terminal-emulator pager break help...") (sit-for 0) (with-electric-help - (function (lambda () - (princ (substitute-command-keys + (lambda () + (princ (substitute-command-keys "\\\ Terminal-emulator MORE break.\n\ Type one of the following keys:\n\n\ @@ -3659,7 +3659,7 @@ Type one of the following keys:\n\n\ Any other key is passed through to the program running under the terminal emulator and disables pager processing until all pending output has been dealt with.")) - nil)))) + nil))) (defun term-pager-continue (new-count) (let ((process (get-buffer-process (current-buffer)))) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 391e7570b5..936edf17ac 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -3503,9 +3503,9 @@ column must consists from cells of same width." (let ((cell-list (table--vertical-cell-list 'top-to-bottom))) (unless (and (table--uniform-list-p - (mapcar (function (lambda (cell) (car (table--get-coordinate (car cell))))) cell-list)) + (mapcar (lambda (cell) (car (table--get-coordinate (car cell)))) cell-list)) (table--uniform-list-p - (mapcar (function (lambda (cell) (car (table--get-coordinate (cdr cell))))) cell-list))) + (mapcar (lambda (cell) (car (table--get-coordinate (cdr cell)))) cell-list))) (error "Cells in this column are not in uniform width")) (unless lu-coord (setq lu-coord (table--get-coordinate (caar cell-list)))) diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index a905d14800..11db25cb7a 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -422,7 +422,7 @@ An alternative value is \" . \", if you use a font with a narrow period." (push (cons "--" (match-beginning 0)) menu)) ;; Sort in increasing buffer position order. - (sort menu (function (lambda (a b) (< (cdr a) (cdr b)))))))) + (sort menu (lambda (a b) (< (cdr a) (cdr b))))))) ;;;; ;;;; Outline support diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el index a67e5dcd12..056ad1e018 100644 --- a/lisp/url/url-cache.el +++ b/lisp/url/url-cache.el @@ -125,8 +125,8 @@ The actual return value is the last modification time of the cache file." (setq fname (and fname (mapconcat - (function (lambda (x) - (if (= x ?~) "" (char-to-string x)))) + (lambda (x) + (if (= x ?~) "" (char-to-string x))) fname "")) fname (cond ((null fname) nil) commit 6cbc253aa0580e2f242551500764bba9780e669d Author: Stefan Kangas Date: Wed Sep 30 16:02:22 2020 +0200 Don't recommend quoting lambdas * doc/misc/calc.texi (Symbolic Lisp Functions): * doc/misc/cl.texi (Obsolete Lexical Binding): * lisp/master.el: * lisp/progmodes/sql.el (sql-interactive-mode): * lisp/textmodes/flyspell.el (flyspell-mode): * lisp/textmodes/ispell.el (ispell-message): * lisp/textmodes/table.el: Doc fixes; don't recommend quoting lambdas. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 1dab29b8a5..a356cecf2b 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -34743,15 +34743,15 @@ is defined by @smallexample (put 'calcFunc-ln\' 'math-derivative-1 - (function (lambda (u) (math-div 1 u)))) + (lambda (u) (math-div 1 u))) @end smallexample The two-argument @code{log} function has two derivatives, @smallexample (put 'calcFunc-log\' 'math-derivative-2 ; d(log(x,b)) / dx - (function (lambda (x b) ... ))) + (lambda (x b) ... )) (put 'calcFunc-log\'2 'math-derivative-2 ; d(log(x,b)) / db - (function (lambda (x b) ... ))) + (lambda (x b) ... )) @end smallexample @end defun @@ -34818,7 +34818,7 @@ as properties in a manner similar to derivatives: @smallexample (put 'calcFunc-ln 'math-inverse - (function (lambda (x) (list 'calcFunc-exp x)))) + (lambda (x) (list 'calcFunc-exp x))) @end smallexample This function can call @samp{(math-solve-get-sign @var{x})} to create diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index b5f26e004b..2b38544dc8 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -4818,7 +4818,7 @@ For example: @example (defun make-adder (n) (lexical-let ((n n)) - (function (lambda (m) (+ n m))))) + (lambda (m) (+ n m)))) (setq add17 (make-adder 17)) (funcall add17 4) @result{} 21 diff --git a/lisp/master.el b/lisp/master.el index 387116a8fb..32556a535f 100644 --- a/lisp/master.el +++ b/lisp/master.el @@ -36,12 +36,12 @@ ;; SQL buffer. ;; ;; (add-hook 'sql-mode-hook -;; (function (lambda () -;; (master-mode t) -;; (master-set-slave sql-buffer)))) +;; (lambda () +;; (master-mode t) +;; (master-set-slave sql-buffer))) ;; (add-hook 'sql-set-sqli-hook -;; (function (lambda () -;; (master-set-slave sql-buffer)))) +;; (lambda () +;; (master-set-slave sql-buffer))) ;;; Thanks to all the people who helped me out: ;; diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index c31c5ddd87..7aa7d6410e 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -4293,14 +4293,14 @@ Here is an example for your init file. It keeps the SQLi buffer a certain length. \(add-hook \\='sql-interactive-mode-hook - (function (lambda () - (setq comint-output-filter-functions #\\='comint-truncate-buffer)))) + (lambda () + (setq comint-output-filter-functions #\\='comint-truncate-buffer))) Here is another example. It will always put point back to the statement you entered, right above the output it created. \(setq comint-output-filter-functions - (function (lambda (STR) (comint-show-output))))" + (lambda (STR) (comint-show-output)))" :syntax-table sql-mode-syntax-table ;; FIXME: The doc above uses `setq' on `comint-output-filter-functions', ;; whereas hooks should be manipulated with things like `add/remove-hook'. diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index e862e354b5..65702d081f 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -524,7 +524,7 @@ invoking `ispell-change-dictionary'. Consider using the `ispell-parser' to check your text. For instance consider adding: -\(add-hook \\='tex-mode-hook (function (lambda () (setq ispell-parser \\='tex)))) +\(add-hook \\='tex-mode-hook (lambda () (setq ispell-parser \\='tex))) in your init file. \\[flyspell-region] checks all words inside a region. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index a99dfe4067..05a4bd058c 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -3937,7 +3937,7 @@ in your init file: You can bind this to the key C-c i in GNUS or mail by adding to `news-reply-mode-hook' or `mail-mode-hook' the following lambda expression: - (function (lambda () (local-set-key \"\\C-ci\" \\='ispell-message)))" + (lambda () (local-set-key \"\\C-ci\" \\='ispell-message))" (interactive) (save-excursion (goto-char (point-min)) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index c7bf687a9e..391e7570b5 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -339,8 +339,8 @@ ;; When using `table-cell-map-hook' do not use `local-set-key'. ;; ;; (add-hook 'table-cell-map-hook -;; (function (lambda () -;; (local-set-key [] ')))) +;; (lambda () +;; (local-set-key [] '))) ;; ;; Adding the above to your init file is a common way to customize a ;; mode specific keymap. However it does not work for this package. @@ -349,8 +349,8 @@ ;; explicitly. The correct way of achieving above task is: ;; ;; (add-hook 'table-cell-map-hook -;; (function (lambda () -;; (define-key table-cell-map [] ')))) +;; (lambda () +;; (define-key table-cell-map [] '))) ;; ;; ----- ;; Menu: commit 6a4b931c215c5c449833c784a9214f727d641a37 Author: Glenn Morris Date: Thu Oct 1 06:27:29 2020 -0700 ; Auto-commit of loaddefs files. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 40a4150628..ec31e21d7d 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -5950,12 +5950,12 @@ Variables controlling indentation style: `cperl-min-label-indent' Minimal indentation for line that is a label. -Settings for classic indent-styles: K&R BSD=C++ GNU PerlStyle=Whitesmith - `cperl-indent-level' 5 4 2 4 - `cperl-brace-offset' 0 0 0 0 - `cperl-continued-brace-offset' -5 -4 0 0 - `cperl-label-offset' -5 -4 -2 -4 - `cperl-continued-statement-offset' 5 4 2 4 +Settings for classic indent-styles: K&R BSD=C++ GNU PBP PerlStyle=Whitesmith + `cperl-indent-level' 5 4 2 4 4 + `cperl-brace-offset' 0 0 0 0 0 + `cperl-continued-brace-offset' -5 -4 0 0 0 + `cperl-label-offset' -5 -4 -2 -2 -4 + `cperl-continued-statement-offset' 5 4 2 4 4 CPerl knows several indentation styles, and may bulk set the corresponding variables. Use \\[cperl-set-style] to do this. Use @@ -6726,7 +6726,7 @@ Create a new data-debug buffer with NAME. (autoload 'dbus-handle-event "dbus" "\ Handle events from the D-Bus. EVENT is a D-Bus event, see `dbus-check-event'. HANDLER, being -part of the event, is called with arguments ARGS. +part of the event, is called with arguments ARGS (without type information). If the HANDLER returns a `dbus-error', it is propagated as return message. \(fn EVENT)" t nil) @@ -7762,6 +7762,23 @@ Keybindings: \(fn &optional DIRNAME SWITCHES)" nil nil) (put 'dired-find-alternate-file 'disabled t) +(autoload 'dired-jump "dired" "\ +Jump to Dired buffer corresponding to current buffer. +If in a file, Dired the current directory and move to file's line. +If in Dired already, pop up a level and goto old directory's line. +In case the proper Dired file line cannot be found, refresh the dired +buffer and try again. +When OTHER-WINDOW is non-nil, jump to Dired buffer in other window. +When FILE-NAME is non-nil, jump to its line in Dired. +Interactively with prefix argument, read FILE-NAME. + +\(fn &optional OTHER-WINDOW FILE-NAME)" t nil) + +(autoload 'dired-jump-other-window "dired" "\ +Like \\[dired-jump] (`dired-jump') but in other window. + +\(fn &optional FILE-NAME)" t nil) + (register-definition-prefixes "dired" '("dired-")) ;;;*** @@ -8300,9 +8317,6 @@ BODY contains code to execute each time the mode is enabled or disabled. the minor mode is global): :group GROUP Custom group name to use in all generated `defcustom' forms. - Defaults to MODE without the possible trailing \"-mode\". - Don't use this default group name unless you have written a - `defgroup' to define that group properly. :global GLOBAL If non-nil specifies that the minor mode is not meant to be buffer-local, so don't make the variable MODE buffer-local. By default, the mode is buffer-local. @@ -10028,7 +10042,7 @@ It creates an autoload function for CNAME's constructor. ;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (0 0 0 0)) ;;; Generated autoloads from emacs-lisp/eldoc.el -(push (purecopy '(eldoc 1 9 0)) package--builtin-versions) +(push (purecopy '(eldoc 1 10 0)) package--builtin-versions) ;;;*** @@ -10292,7 +10306,7 @@ displayed." t nil) ;;;;;; (0 0 0 0)) ;;; Generated autoloads from eshell/em-unix.el -(register-definition-prefixes "em-unix" '("eshell" "nil-blank-string" "pcomplete/")) +(register-definition-prefixes "em-unix" '("eshell" "nil-blank-string")) ;;;*** @@ -10300,7 +10314,7 @@ displayed." t nil) ;;;;;; (0 0 0 0)) ;;; Generated autoloads from eshell/em-xtra.el -(register-definition-prefixes "em-xtra" '("eshell/" "pcomplete/bcc")) +(register-definition-prefixes "em-xtra" '("eshell/")) ;;;*** @@ -10349,7 +10363,15 @@ Already submitted bugs can be found in the Emacs bug tracker: (set-advertised-calling-convention 'report-emacs-bug '(topic) '"24.5") -(register-definition-prefixes "emacsbug" '("report-emacs-bug-")) +(autoload 'submit-emacs-patch "emacsbug" "\ +Send an Emacs patch to the Emacs maintainers. +Interactively, you will be prompted for SUBJECT and a patch FILE +name (which will be attached to the mail). You will end up in a +Message buffer where you can explain more about the patch. + +\(fn SUBJECT FILE)" t nil) + +(register-definition-prefixes "emacsbug" '("emacs-bug--system-description" "report-emacs-bug-")) ;;;*** @@ -11104,6 +11126,14 @@ Interactively select a server to connect to using `erc-server-alist'." t nil) (register-definition-prefixes "erc-stamp" '("erc-")) +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "erc-status-sidebar" +;;;;;; "erc/erc-status-sidebar.el" (0 0 0 0)) +;;; Generated autoloads from erc/erc-status-sidebar.el + +(register-definition-prefixes "erc-status-sidebar" '("erc-status-sidebar-")) + ;;;*** ;;;### (autoloads "actual autoloads are elsewhere" "erc-track" "erc/erc-track.el" @@ -11253,6 +11283,11 @@ Emacs shell interactive mode. \(fn)" t nil) +(autoload 'eshell-bookmark-jump "esh-mode" "\ +Default bookmark handler for Eshell buffers. + +\(fn BOOKMARK)" nil nil) + (register-definition-prefixes "esh-mode" '("eshell")) ;;;*** @@ -11599,7 +11634,7 @@ Do `query-replace-regexp' of FROM with TO on all files listed in tags table. Third arg DELIMITED (prefix arg) means replace only word-delimited matches. If you exit (\\[keyboard-quit], RET or q), you can resume the query replace with the command \\[tags-loop-continue]. -For non-interactive use, superceded by `fileloop-initialize-replace'. +For non-interactive use, superseded by `fileloop-initialize-replace'. \(fn FROM TO &optional DELIMITED FILES)" t nil) @@ -12818,6 +12853,9 @@ The command run (after changing into DIR) is essentially except that the car of the variable `find-ls-option' specifies what to use in place of \"-ls\" as the final argument. +Collect output in the \"*Find*\" buffer. To kill the job before +it finishes, type \\[kill-find]. + \(fn DIR ARGS)" t nil) (autoload 'find-name-dired "find-dired" "\ @@ -14112,6 +14150,10 @@ instead (which see).") (autoload 'define-generic-mode "generic" "\ Create a new generic mode MODE. +A \"generic\" mode is a simple major mode with basic support for +comment syntax and Font Lock mode, but otherwise does not have +any special keystrokes or functionality available. + MODE is the name of the command for the generic mode; don't quote it. The optional DOCSTRING is the documentation for the mode command. If you do not supply it, `define-generic-mode' uses a default @@ -22130,6 +22172,12 @@ different buffer menu using the function `msb'. ;;;### (autoloads nil "mspools" "mail/mspools.el" (0 0 0 0)) ;;; Generated autoloads from mail/mspools.el +(autoload 'mspools-show "mspools" "\ +Show the list of non-empty spool files in the *spools* buffer. +Buffer is not displayed if SHOW is non-nil. + +\(fn &optional NOSHOW)" t nil) + (register-definition-prefixes "mspools" '("mspools-")) ;;;*** @@ -22848,7 +22896,7 @@ This command does not work if you use short group names." t nil) ;;;### (autoloads nil "nnir" "gnus/nnir.el" (0 0 0 0)) ;;; Generated autoloads from gnus/nnir.el -(register-definition-prefixes "nnir" '("gnus-" "nnir-")) +(register-definition-prefixes "nnir" '("nnir-")) ;;;*** @@ -22925,6 +22973,13 @@ Generate NOV databases in all nnml directories. (register-definition-prefixes "nnrss" '("nnrss-")) +;;;*** + +;;;### (autoloads nil "nnselect" "gnus/nnselect.el" (0 0 0 0)) +;;; Generated autoloads from gnus/nnselect.el + +(register-definition-prefixes "nnselect" '("gnus-" "ids-by-group" "nnselect-" "numbers-by-group")) + ;;;*** ;;;### (autoloads nil "nnspool" "gnus/nnspool.el" (0 0 0 0)) @@ -25502,7 +25557,12 @@ Completion rules for the `ssh' command." nil nil) Completion rules for the `scp' command. Includes files as well as host names followed by a colon." nil nil) -(register-definition-prefixes "pcmpl-unix" '("pcmpl-")) +(autoload 'pcomplete/telnet "pcmpl-unix" nil nil nil) + +(autoload 'pcomplete/rsh "pcmpl-unix" "\ +Complete `rsh', which, after the user and hostname, is like xargs." nil nil) + +(register-definition-prefixes "pcmpl-unix" '("pcmpl-" "pcomplete/")) ;;;*** @@ -25522,6 +25582,11 @@ long options." nil nil) (autoload 'pcomplete/ag "pcmpl-x" "\ Completion for the `ag' command." nil nil) +(autoload 'pcomplete/bcc32 "pcmpl-x" "\ +Completion function for Borland's C++ compiler." nil nil) + +(defalias 'pcomplete/bcc 'pcomplete/bcc32) + (register-definition-prefixes "pcmpl-x" '("pcmpl-x-")) ;;;*** @@ -26573,7 +26638,7 @@ Open profile FILENAME. ;;;### (autoloads nil "project" "progmodes/project.el" (0 0 0 0)) ;;; Generated autoloads from progmodes/project.el -(push (purecopy '(project 0 5 1)) package--builtin-versions) +(push (purecopy '(project 0 5 2)) package--builtin-versions) (autoload 'project-current "project" "\ Return the project instance in DIRECTORY, defaulting to `default-directory'. @@ -26622,7 +26687,8 @@ Run project command, displaying resultant buffer in a new tab. The following commands are available: \\{project-prefix-map}" t nil) - (define-key tab-prefix-map "p" #'project-other-tab-command) + +(when (bound-and-true-p tab-prefix-map) (define-key tab-prefix-map "p" #'project-other-tab-command)) (autoload 'project-find-regexp "project" "\ Find all matches for REGEXP in the current project's roots. @@ -26742,7 +26808,7 @@ identical. Only the buffers that match a condition in `project-kill-buffer-conditions' will be killed. If NO-CONFIRM is non-nil, the command will not ask the user for confirmation. NO-CONFIRM is always nil when the command is invoked -interactivly. +interactively. \(fn &optional NO-CONFIRM)" t nil) @@ -28249,6 +28315,8 @@ disabled. Reveal mode is a buffer-local minor mode. When enabled, it reveals invisible text around point. +Also see the `reveal-auto-hide' variable. + \(fn &optional ARG)" t nil) (defvar global-reveal-mode nil "\ @@ -30414,7 +30482,7 @@ and `default-sendmail-coding-system', but lower priority than the local value of `buffer-file-coding-system'. See also the function `select-message-coding-system'.") -(defvar default-sendmail-coding-system 'iso-latin-1 "\ +(defvar default-sendmail-coding-system 'utf-8 "\ Default coding system for encoding the outgoing mail. This variable is used only when `sendmail-coding-system' is nil. @@ -31479,7 +31547,7 @@ Use \\[so-long-customize] to configure the behaviour. ;;;### (autoloads nil "soap-client" "net/soap-client.el" (0 0 0 0)) ;;; Generated autoloads from net/soap-client.el -(push (purecopy '(soap-client 3 1 5)) package--builtin-versions) +(push (purecopy '(soap-client 3 2 0)) package--builtin-versions) (register-definition-prefixes "soap-client" '("soap-")) @@ -32718,6 +32786,27 @@ Studlify-case the current buffer." t nil) ;;;### (autoloads nil "subr-x" "emacs-lisp/subr-x.el" (0 0 0 0)) ;;; Generated autoloads from emacs-lisp/subr-x.el +(autoload 'if-let "subr-x" "\ +Bind variables according to SPEC and evaluate THEN or ELSE. +Evaluate each binding in turn, as in `let*', stopping if a +binding value is nil. If all are non-nil return the value of +THEN, otherwise the last form in ELSE. + +Each element of SPEC is a list (SYMBOL VALUEFORM) that binds +SYMBOL to the value of VALUEFORM. An element can additionally be +of the form (VALUEFORM), which is evaluated and checked for nil; +i.e. SYMBOL can be omitted if only the test result is of +interest. It can also be of the form SYMBOL, then the binding of +SYMBOL is checked for nil. + +As a special case, interprets a SPEC of the form (SYMBOL SOMETHING) +like ((SYMBOL SOMETHING)). This exists for backward compatibility +with an old syntax that accepted only one binding. + +\(fn SPEC THEN &rest ELSE)" nil t) + +(function-put 'if-let 'lisp-indent-function '2) + (autoload 'when-let "subr-x" "\ Bind variables according to SPEC and conditionally evaluate BODY. Evaluate each binding in turn, stopping if a binding value is nil. @@ -32734,7 +32823,7 @@ Truncate STRING to LENGTH, replacing initial surplus with \"...\". \(fn STRING LENGTH)" nil nil) -(register-definition-prefixes "subr-x" '("and-let*" "hash-table-" "if-let" "internal--" "replace-region-contents" "string-" "thread-" "when-let*")) +(register-definition-prefixes "subr-x" '("and-let*" "hash-table-" "if-let*" "internal--" "replace-region-contents" "string-" "thread-" "when-let*")) ;;;*** @@ -32880,7 +32969,7 @@ and `sc-post-hook' is run after the guts of this function." nil nil) ;;;### (autoloads nil "svg" "svg.el" (0 0 0 0)) ;;; Generated autoloads from svg.el -(push (purecopy '(svg 1 0)) package--builtin-versions) +(push (purecopy '(svg 1 1)) package--builtin-versions) (register-definition-prefixes "svg" '("svg-")) @@ -34597,7 +34686,7 @@ runs the normal hook `display-time-hook' after each update. \(fn &optional ARG)" t nil) -(defalias 'display-time-world #'world-clock) +(define-obsolete-function-alias 'display-time-world #'world-clock "28.1") (autoload 'world-clock "time" "\ Display a world clock buffer with times in various time zones. @@ -34608,8 +34697,10 @@ To turn off the world time display, go to the window and type `\\[quit-window]'. Return a string giving the uptime of this instance of Emacs. FORMAT is a string to format the result, using `format-seconds'. For example, the Unix uptime command format is \"%D, %z%2h:%.2m\". +If the optional argument HERE is non-nil, insert string at +point. -\(fn &optional FORMAT)" t nil) +\(fn &optional FORMAT HERE)" t nil) (autoload 'emacs-init-time "time" "\ Return a string giving the duration of the Emacs initialization." t nil) @@ -38441,6 +38532,11 @@ See also `warning-series', `warning-prefix-function', `warning-fill-prefix', and `warning-fill-column' for additional programming features. +This will also display buttons allowing the user to permanently +disable automatic display of the warning or disable the warning +entirely by setting `warning-suppress-types' or +`warning-suppress-log-types' on their behalf. + \(fn TYPE MESSAGE &optional LEVEL BUFFER-NAME)" nil nil) (autoload 'lwarn "warnings" "\ @@ -39601,16 +39697,16 @@ Zone out, completely." t nil) ;;;;;; "erc/erc-notify.el" "erc/erc-page.el" "erc/erc-pcomplete.el" ;;;;;; "erc/erc-replace.el" "erc/erc-ring.el" "erc/erc-services.el" ;;;;;; "erc/erc-sound.el" "erc/erc-speedbar.el" "erc/erc-spelling.el" -;;;;;; "erc/erc-stamp.el" "erc/erc-track.el" "erc/erc-truncate.el" -;;;;;; "erc/erc-xdcc.el" "eshell/em-alias.el" "eshell/em-banner.el" -;;;;;; "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el" -;;;;;; "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el" -;;;;;; "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el" -;;;;;; "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el" -;;;;;; "eshell/em-tramp.el" "eshell/em-unix.el" "eshell/em-xtra.el" -;;;;;; "facemenu.el" "faces.el" "files.el" "font-core.el" "font-lock.el" -;;;;;; "format.el" "frame.el" "help.el" "hfy-cmap.el" "ibuf-ext.el" -;;;;;; "indent.el" "international/characters.el" "international/charprop.el" +;;;;;; "erc/erc-stamp.el" "erc/erc-status-sidebar.el" "erc/erc-track.el" +;;;;;; "erc/erc-truncate.el" "erc/erc-xdcc.el" "eshell/em-alias.el" +;;;;;; "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el" +;;;;;; "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el" +;;;;;; "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el" +;;;;;; "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el" +;;;;;; "eshell/em-term.el" "eshell/em-tramp.el" "eshell/em-unix.el" +;;;;;; "eshell/em-xtra.el" "facemenu.el" "faces.el" "files.el" "font-core.el" +;;;;;; "font-lock.el" "format.el" "frame.el" "help.el" "hfy-cmap.el" +;;;;;; "ibuf-ext.el" "indent.el" "international/characters.el" "international/charprop.el" ;;;;;; "international/charscript.el" "international/cp51932.el" ;;;;;; "international/eucjp-ms.el" "international/mule-cmds.el" ;;;;;; "international/mule-conf.el" "international/mule.el" "international/uni-bidi.el" commit 0aa1e2d9d03cf4c10b58c64067620bb99a41f9e9 Author: Michael Albinus Date: Thu Oct 1 11:20:38 2020 +0200 Use Fkeywordp in dbusbind.c, again * src/dbusbind.c (XD_KEYWORDP): New macro. (XD_DBUS_TYPE_P, Fdbus__init_bus, xd_read_queued_messages): Use it. diff --git a/src/dbusbind.c b/src/dbusbind.c index 54130be685..cca5f13907 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -209,9 +209,12 @@ xd_dbus_type_to_symbol (int type) : Qnil; } +#define XD_KEYWORDP(object) !NILP (Fkeywordp (object)) + /* Check whether a Lisp symbol is a predefined D-Bus type symbol. */ #define XD_DBUS_TYPE_P(object) \ - SYMBOLP (object) && ((xd_symbol_to_dbus_type (object) != DBUS_TYPE_INVALID)) + XD_KEYWORDP (object) && \ + ((xd_symbol_to_dbus_type (object) != DBUS_TYPE_INVALID)) /* Determine the DBusType of a given Lisp OBJECT. It is used to convert Lisp objects, being arguments of `dbus-call-method' or @@ -1231,7 +1234,7 @@ this connection to those buses. */) xd_add_watch, xd_remove_watch, xd_toggle_watch, - SYMBOLP (bus) + XD_KEYWORDP (bus) ? (void *) XSYMBOL (bus) : (void *) XSTRING (bus), NULL)) @@ -1797,7 +1800,7 @@ xd_read_queued_messages (int fd, void *data) while (!NILP (busp)) { key = CAR_SAFE (CAR_SAFE (busp)); - if ((SYMBOLP (key) && XSYMBOL (key) == data) + if ((XD_KEYWORDP (key) && XSYMBOL (key) == data) || (STRINGP (key) && XSTRING (key) == data)) bus = key; busp = CDR_SAFE (busp);