commit b19df8ae78cdebe76512a70f76ec68677de41c11 (HEAD, refs/remotes/origin/master) Author: Stefan Monnier Date: Wed Dec 27 18:42:01 2017 -0500 Remove uses of `cl` from test/ subdirectory * test/lisp/gnus/gnus-tests.el: Remove unneeded (require 'cl). * test/lisp/net/gnutls-tests.el: Use cl-lib and pcase. diff --git a/test/lisp/gnus/gnus-tests.el b/test/lisp/gnus/gnus-tests.el index c2a41d717c..18a445dff3 100644 --- a/test/lisp/gnus/gnus-tests.el +++ b/test/lisp/gnus/gnus-tests.el @@ -26,8 +26,6 @@ ;;; Code: ;; registry.el is required by gnus-registry.el but this way we're explicit. -(eval-when-compile (require 'cl)) - (require 'registry) (require 'gnus-registry) diff --git a/test/lisp/net/gnutls-tests.el b/test/lisp/net/gnutls-tests.el index fd0b5decb8..4636a9a5c8 100644 --- a/test/lisp/net/gnutls-tests.el +++ b/test/lisp/net/gnutls-tests.el @@ -26,7 +26,7 @@ ;;; Code: (require 'ert) -(require 'cl) +(require 'cl-lib) (require 'gnutls) (require 'hex-util) @@ -46,22 +46,22 @@ (defvar gnutls-tests-tested-macs (when (gnutls-available-p) - (remove-duplicates - (append (mapcar 'cdr gnutls-tests-internal-macs-upcased) - (mapcar 'car (gnutls-macs)))))) + (cl-remove-duplicates + (append (mapcar #'cdr gnutls-tests-internal-macs-upcased) + (mapcar #'car (gnutls-macs)))))) (defvar gnutls-tests-tested-digests (when (gnutls-available-p) - (remove-duplicates - (append (mapcar 'cdr gnutls-tests-internal-macs-upcased) - (mapcar 'car (gnutls-digests)))))) + (cl-remove-duplicates + (append (mapcar #'cdr gnutls-tests-internal-macs-upcased) + (mapcar #'car (gnutls-digests)))))) (defvar gnutls-tests-tested-ciphers (when (gnutls-available-p) - (remove-duplicates - ; these cause FPEs or SEGVs - (remove-if (lambda (e) (memq e '(ARCFOUR-128))) - (mapcar 'car (gnutls-ciphers)))))) + (cl-remove-duplicates + ;; these cause FPEs or SEGVs + (cl-remove-if (lambda (e) (memq e '(ARCFOUR-128))) + (mapcar #'car (gnutls-ciphers)))))) (defvar gnutls-tests-mondo-strings (list @@ -154,7 +154,7 @@ ("0cc175b9c0f1b6a831c399e269772661" "a" MD5) ("a9993e364706816aba3e25717850c26c9cd0d89d" "abc" SHA1) ("a9993e364706816aba3e25717850c26c9cd0d89d" "abc" "SHA1"))) ; check string ID for digest - (destructuring-bind (hash input mac) test + (pcase-let ((`(,hash ,input ,mac) test)) (let ((plist (cdr (assq mac macs))) result resultb) (gnutls-tests-message "%s %S" mac plist) @@ -178,7 +178,7 @@ ("81568ba71fa2c5f33cc84bf362466988f98eba3735479100b4e8908acad87ac4" "more and more data goes into a file to exceed the buffer size" "very long key goes here to exceed the key size" SHA256) ("4bc830005783a73b8112f4bd5f4aa5f92e05b51e9b55c0cd6f9a7bee48371def" "more and more data goes into a file to exceed the buffer size" "" "SHA256") ; check string ID for HMAC ("4bc830005783a73b8112f4bd5f4aa5f92e05b51e9b55c0cd6f9a7bee48371def" "more and more data goes into a file to exceed the buffer size" "" SHA256))) - (destructuring-bind (hash input key mac) test + (pcase-let ((`(,hash ,input ,key ,mac) test)) (let ((plist (cdr (assq mac macs))) result) (gnutls-tests-message "%s %S" mac plist) @@ -214,7 +214,7 @@ (let ((keys '("mykey" "mykey2")) (inputs gnutls-tests-mondo-strings) (ivs '("" "-abc123-" "init" "ini2")) - (ciphers (remove-if + (ciphers (cl-remove-if (lambda (c) (plist-get (cdr (assq c (gnutls-ciphers))) :cipher-aead-capable)) gnutls-tests-tested-ciphers))) @@ -252,7 +252,7 @@ "auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data auth and auth of data " "AUTH data and more data to go over the block limit!" "AUTH data and more data to go over the block limit")) - (ciphers (remove-if + (ciphers (cl-remove-if (lambda (c) (or (null (plist-get (cdr (assq c (gnutls-ciphers))) :cipher-aead-capable)))) gnutls-tests-tested-ciphers)) commit fb619c1c22b986841964b09b7effe42785f3fed8 Author: Stefan Monnier Date: Wed Dec 27 17:49:39 2017 -0500 (delayed-after-hook-functions): Tighten the code a bit * lisp/subr.el (delayed-mode-hooks, delayed-after-hook-functions): Use defvar-local. (run-mode-hooks): Reset delayed-after-hook-functions before running those functions, in case an error is signaled. * lisp/emacs-lisp/derived.el (define-derived-mode): Don't duplicate code. diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index c0ef199424..3bb8eb4f2f 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -281,12 +281,10 @@ No problems result if this variable is not bound. ; Splice in the body (if any). ,@body ) - ;; Run the hooks, if any. - (run-mode-hooks ',hook) - ,@(when after-hook - `((if delay-mode-hooks - (push (lambda () ,after-hook) delayed-after-hook-functions) - ,after-hook))))))) + ,@(when after-hook + `((push (lambda () ,after-hook) delayed-after-hook-functions))) + ;; Run the hooks (and delayed-after-hook-functions), if any. + (run-mode-hooks ',hook))))) ;; PUBLIC: find the ultimate class of a derived mode. diff --git a/lisp/subr.el b/lisp/subr.el index 67209b4d4f..76d7a1a556 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1839,15 +1839,13 @@ if it is empty or a duplicate." (defvar delay-mode-hooks nil "If non-nil, `run-mode-hooks' should delay running the hooks.") -(defvar delayed-mode-hooks nil +(defvar-local delayed-mode-hooks nil "List of delayed mode hooks waiting to be run.") -(make-variable-buffer-local 'delayed-mode-hooks) (put 'delay-mode-hooks 'permanent-local t) -(defvar delayed-after-hook-functions nil +(defvar-local delayed-after-hook-functions nil "List of delayed :after-hook forms waiting to be run. These forms come from `define-derived-mode'.") -(make-variable-buffer-local 'delayed-after-hook-functions) (defvar change-major-mode-after-body-hook nil "Normal hook run in major mode functions, before the mode hooks.") @@ -1889,9 +1887,9 @@ running their FOO-mode-hook." (with-demoted-errors "File local-variables error: %s" (hack-local-variables 'no-mode))) (run-hooks 'after-change-major-mode-hook) - (dolist (fun (nreverse delayed-after-hook-functions)) - (funcall fun)) - (setq delayed-after-hook-functions nil))) + (dolist (fun (prog1 (nreverse delayed-after-hook-functions) + (setq delayed-after-hook-functions nil))) + (funcall fun)))) (defmacro delay-mode-hooks (&rest body) "Execute BODY, but delay any `run-mode-hooks'. commit f16ba58809fa9b83d42f2bb6b4722599bc98b408 Author: Glenn Morris Date: Wed Dec 27 10:50:45 2017 -0800 Fix recent rfc2231 avoidance of cl * lisp/mail/rfc2231.el (rfc2231-parse-string) (rfc2231-encode-string): Replace cl forms with cl-lib versions. diff --git a/lisp/mail/rfc2231.el b/lisp/mail/rfc2231.el index dab78070e4..e032597327 100644 --- a/lisp/mail/rfc2231.el +++ b/lisp/mail/rfc2231.el @@ -180,7 +180,7 @@ must never cause a Lisp error." ;; Now collect and concatenate continuation parameters. (let ((cparams nil) elem) - (loop for (attribute value part encoded) + (cl-loop for (attribute value part encoded) in (sort parameters (lambda (e1 e2) (< (or (caddr e1) 0) (or (caddr e2) 0)))) @@ -290,7 +290,7 @@ the result of this function." (insert param "*=") (while (not (eobp)) (insert (if (>= num 0) " " "") - param "*" (format "%d" (incf num)) "*=") + param "*" (format "%d" (cl-incf num)) "*=") (forward-line 1)))) (spacep (goto-char (point-min)) commit 08e1438a3bf781ce85c7af75f1fa73cb826ba3dd Merge: da94ea92bc fd35804971 Author: Glenn Morris Date: Wed Dec 27 10:00:16 2017 -0800 Merge from origin/emacs-26 fd35804971 (origin/emacs-26) * doc/lispref/strings.texi (Case Convers... 89e257d71b * doc/misc/speedbar.texi (Top): Fix grammar. a31ab5ffb5 * lisp/subr.el (with-silent-modifications): Doc fixes. 2ebc8dc3b6 Fix curved quotes in printed manual e4a881b5cf Say that "gnus-cloud" is a parody name 13c59d0a83 More improvements for text.texi 7850b7620e Adjudicate review comments for the "Text" chapter of user ... d7d3b14a99 * lisp/url/url-http.el (url-http-wait-for-headers-change-f... f3819ad13e In C-h k , alert user to existence of any matchin... 99054fbef9 * net/eww.el (eww): Handle URLs without host part. de89c0b641 Make C-h c/k S-mouse-1 display message for mouse-appearanc... 720ed0b533 Avoid crashes when ':eval' deletes our frame 9105c9aa34 Fix scrolling up in pixel-scroll.el b882d4ef11 Fix problems with ligatures in PDF version of ELisp manual 289dd53bb3 (elisp-flymake-byte-compile): Handle killed buffer in sent... cf36c82127 Avoid some overfull lines in PDF lispref b07b56a351 Avoid some overfull lines in PDF manual 6b3118f025 * doc/emacs/arevert-xtra.texi (Auto Reverting the Buffer M... 7ffb7b1e01 ; lispref nil/t markup fixes # Conflicts: # doc/emacs/text.texi commit fd358049719d203d33e6d23d2179aab06c71b49a Author: Glenn Morris Date: Wed Dec 27 09:55:35 2017 -0800 * doc/lispref/strings.texi (Case Conversion): Use a TeX font that support ligatures. diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 24d3ee4587..e711fe33ab 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1212,12 +1212,12 @@ example: @iftex @example @group -(upcase "fi") ; note: single character, ligature "fi" +(upcase "@r{fi}") ; note: single character, ligature "fi" @result{} "FI" @end group @group -(upcase ?fi) - @result{} 64257 ; i.e. ?fi +(upcase ?@r{fi}) + @result{} 64257 ; i.e. ?@r{fi} @end group @end example @end iftex commit 89e257d71bb2ce17531c44a39862252f4d9a5eba Author: Charles A. Roelli Date: Wed Dec 27 18:25:30 2017 +0100 * doc/misc/speedbar.texi (Top): Fix grammar. diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi index ca0bc1f6f3..ba46f43fe9 100644 --- a/doc/misc/speedbar.texi +++ b/doc/misc/speedbar.texi @@ -49,7 +49,7 @@ packages, and web browsers. Speedbar displays a narrow frame in which a tree view is shown. This tree view defaults to containing a list of files and directories. Files can be ``expanded'' to list tags inside. Directories can be expanded to -list the files within itself. Each file or tag can be jumped to +list the files within them. Each file or tag can be jumped to immediately. Speedbar expands upon ``explorer'' windows by maintaining context with the commit a31ab5ffb57d9220da782a24f124e0d8f21f9519 Author: Charles A. Roelli Date: Wed Dec 27 15:53:34 2017 +0100 * lisp/subr.el (with-silent-modifications): Doc fixes. diff --git a/lisp/subr.el b/lisp/subr.el index 64521711b7..778b6449fc 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3471,8 +3471,8 @@ See also `with-temp-file' and `with-output-to-string'." (defmacro with-silent-modifications (&rest body) "Execute BODY, pretending it does not modify the buffer. -This macro is Typically used around modifications of -text-properties which do not really affect the buffer's content. +This macro is typically used around modifications of +text properties which do not really affect the buffer's content. If BODY performs real modifications to the buffer's text, other than cosmetic ones, undo data may become corrupted. commit 2ebc8dc3b6a46a0dff928dd43a2530e9fdb35b20 Author: Eli Zaretskii Date: Tue Dec 26 22:43:32 2017 +0200 Fix curved quotes in printed manual * doc/emacs/text.texi (Quotation Marks): Fix curved quote characters in the printed version of the manual. diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 948abc3a96..1f53992f10 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -424,22 +424,31 @@ beginning of a line. @cindex curved quotes @cindex guillemets @findex electric-quote-mode +@c The funny quoting below is to make the printed version look +@c correct. FIXME. One common way to quote is the typewriter convention, which quotes using straight apostrophes @t{'like this'} or double-quotes @t{"like this"}. Another common way is the curved quote convention, which uses -left and right single or double quotation marks @t{‘like this’} or -@t{“like this”}. In text files, typewriter quotes are simple and +left and right single or double quotation marks `@t{like this}' or +``@t{like this}''@footnote{ +The curved single quote characters are U+2018 LEFT SINGLE QUOTATION +MARK and U+2018 RIGHT SINGLE QUOTATION MARK; the curved double quotes +are U+201C LEFT DOUBLE QUOTATION MARK and U+201D RIGHT DOUBLE +QUOTATION MARK. On text terminals which cannot display these +characters, the Info reader might show them as the typewriter ASCII +quote characters. +}. In text files, typewriter quotes are simple and portable; curved quotes are less ambiguous and typically look nicer. @vindex electric-quote-chars Electric Quote mode makes it easier to type curved quotes. As you -type characters it optionally converts @t{`} to @t{‘}, @t{'} to @t{’}, -@t{``} to @t{“}, and @t{''} to @t{”}. It's possible to change the +type characters it optionally converts @t{`} to ‘, @t{'} to ', +@t{``} to ``, and @t{''} to ''. It's possible to change the default quotes listed above, by customizing the variable @code{electric-quote-chars}, a list of four characters, where the items correspond to the left single quote, the right single quote, the left double quote and the right double quote, respectively, whose -default value is @code{'(?‘ ?’ ?“ ?”)}. +default value is @code{'(?@r{`} ?@r{'} ?@r{``} ?@r{''})}. @vindex electric-quote-paragraph @vindex electric-quote-comment @@ -460,7 +469,7 @@ To toggle it globally, type type @kbd{C-q `} or @kbd{C-q '} instead of @kbd{`} or @kbd{'}. To insert a curved quote even when Electric Quote is disabled or inactive, you can type @kbd{C-x 8 [} for @t{‘}, @kbd{C-x 8 ]} for -@t{’}, @kbd{C-x 8 @{} for @t{“}, and @kbd{C-x 8 @}} for @t{”}. +@t{’}, @kbd{C-x 8 @{} for ``, and @kbd{C-x 8 @}} for ''. @xref{Inserting Text}. Note that the value of @code{electric-quote-chars} does not affect these keybindings, they are not keybindings of @code{electric-quote-mode} but bound in commit e4a881b5cf50bd7e91413ce885a68cad1cad4097 Author: Paul Eggert Date: Mon Dec 25 14:19:37 2017 -0800 Say that "gnus-cloud" is a parody name diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 318f510588..76d83163c2 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -26197,7 +26197,10 @@ marks, so you have to do it locally. The Gnus Cloud package stores the marks, plus any files you choose, on an IMAP server in a special folder. It's like a -DropTorrentSyncBoxOakTree(TM). +DropTorrentSyncBoxOakTree(TM).@footnote{The name ``Gnus Cloud'' +parodizes but otherwise has little to do with ``cloud computing'', a +@url{https://www.gnu.org/philosophy/words-to-avoid.html#CloudComputing, +misleading term normally best avoided}.} @menu * Gnus Cloud Setup:: diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el index 34d54ec3ca..6b64e40181 100644 --- a/lisp/gnus/gnus-cloud.el +++ b/lisp/gnus/gnus-cloud.el @@ -22,6 +22,10 @@ ;;; Commentary: +;; The name gnus-cloud parodizes but otherwise has little to do with +;; "cloud computing", a misleading term normally best avoided. See: +;; https://www.gnu.org/philosophy/words-to-avoid.html#CloudComputing + ;;; Code: (eval-when-compile (require 'cl)) commit 13c59d0a8353a87f21b57ac699c9ff3543a0ee45 Author: Eli Zaretskii Date: Mon Dec 25 21:49:37 2017 +0200 More improvements for text.texi * doc/emacs/text.texi (Outline Motion): Avoid unneeded repetition. Suggested by Petteri Hintsanen in emacs-manual-bugs@gnu.org. diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 3561956791..948abc3a96 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1045,42 +1045,36 @@ forward to heading lines. @table @kbd @item C-c C-n +@findex outline-next-visible-heading +@kindex C-c C-n @r{(Outline mode)} Move point to the next visible heading line (@code{outline-next-visible-heading}). @item C-c C-p +@findex outline-previous-visible-heading +@kindex C-c C-p @r{(Outline mode)} Move point to the previous visible heading line (@code{outline-previous-visible-heading}). @item C-c C-f +@findex outline-forward-same-level +@kindex C-c C-f @r{(Outline mode)} Move point to the next visible heading line at the same level as the one point is on (@code{outline-forward-same-level}). @item C-c C-b +@findex outline-backward-same-level +@kindex C-c C-b @r{(Outline mode)} Move point to the previous visible heading line at the same level (@code{outline-backward-same-level}). @item C-c C-u +@findex outline-up-heading +@kindex C-c C-u @r{(Outline mode)} Move point up to a lower-level (more inclusive) visible heading line (@code{outline-up-heading}). @end table -@findex outline-next-visible-heading -@findex outline-previous-visible-heading -@kindex C-c C-n @r{(Outline mode)} -@kindex C-c C-p @r{(Outline mode)} - @kbd{C-c C-n} (@code{outline-next-visible-heading}) moves down to -the next heading line. @kbd{C-c C-p} -(@code{outline-previous-visible-heading}) moves similarly backward. -Both accept numeric arguments as repeat counts. - -@findex outline-up-heading -@findex outline-forward-same-level -@findex outline-backward-same-level -@kindex C-c C-f @r{(Outline mode)} -@kindex C-c C-b @r{(Outline mode)} -@kindex C-c C-u @r{(Outline mode)} - @kbd{C-c C-f} (@code{outline-forward-same-level}) and @kbd{C-c C-b} -(@code{outline-backward-same-level}) move from one heading line to -another visible heading at the same depth in the outline. @kbd{C-c -C-u} (@code{outline-up-heading}) moves backward to another heading -that is less deeply nested. + All of the above commands accept numeric arguments as repeat counts. +For example, @kbd{C-c C-f}, when given an argument, moves forward that +many visible heading lines on the same level, and @kbd{C-c C-u} with +an argument moves out of that many nested levels. @node Outline Visibility @subsection Outline Visibility Commands commit 7850b7620e2bc6cb9ed43ea00f84a0ad04193fe3 Author: Eli Zaretskii Date: Sun Dec 24 20:47:06 2017 +0200 Adjudicate review comments for the "Text" chapter of user manual * doc/emacs/text.texi (Text): Rearrange text for clarity. Add cross-reference to the Org manual. Make the cross-reference to Outline Mode appear in online manuals as well (the conditional was a forgotten remnant from time immemoriam). (Paragraphs): Add a note that 'paragraph-start' and 'paragraph-separate' should not be anchored. (Auto Fill): Remove redundant text. Suggested by Petteri Hintsanen in emacs-manual-bugs@gnu.org. diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 67c279a743..3561956791 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -22,13 +22,17 @@ are also often useful for editing programs. the file contains ordinary text, use Text mode, which customizes Emacs in small ways for the syntactic conventions of text. Outline mode provides special commands for operating on text with an outline -structure. Org mode extends Outline mode and turn Emacs into a -full-fledged organizer: you can manage TODO lists, store notes and -publish them in many formats. +structure. @xref{Outline Mode}. -@iftex -@xref{Outline Mode}. -@end iftex + Org mode extends Outline mode and turns Emacs into a full-fledged +organizer: you can manage TODO lists, store notes and publish them in +many formats. +@ifinfo +@xref{Top, The Org Manual,,org, The Org Manual}. +@end ifinfo +@ifnotinfo +See the Org Info manual, which is distributed with Emacs. +@end ifnotinfo @cindex nXML mode @cindex mode, XML @@ -324,6 +328,12 @@ that start a new paragraph and are contained in it must match only in Fundamental mode, @code{paragraph-start} is @w{@code{"\f\\|[ \t]*$"}}, and @code{paragraph-separate} is @w{@code{"[ \t\f]*$"}}. + Note that @code{paragraph-start} and @code{paragraph-separate} are +matched against the text at the left margin, which is not necessarily +the beginning of the line, so these regexps should not use @samp{^} as +an anchor, to ensure that the paragraph functions will work equally +within a region of text indented by a margin setting. + @node Pages @section Pages @@ -479,8 +489,8 @@ text. @cindex mode, Auto Fill @dfn{Auto Fill} mode is a buffer-local minor mode (@pxref{Minor -Modes}) in which lines are broken automatically when they become too -wide. Breaking happens only when you type a @key{SPC} or @key{RET}. +Modes}) in which lines are broken automatically at spaces when the +line becomes too wide. @table @kbd @item M-x auto-fill-mode @@ -492,14 +502,12 @@ In Auto Fill mode, break lines when appropriate. @findex auto-fill-mode The mode command @kbd{M-x auto-fill-mode} toggles Auto Fill mode in -the current buffer. With a positive numeric argument, it enables Auto -Fill mode, and with a negative argument it disables it. If -@code{auto-fill-mode} is called from Lisp with an omitted or -@code{nil} argument, it enables Auto Fill mode. To enable Auto Fill -mode automatically in certain major modes, add @code{auto-fill-mode} -to the mode hooks (@pxref{Major Modes}). When Auto Fill mode is -enabled, the mode indicator @samp{Fill} appears in the mode line -(@pxref{Mode Line}). +the current buffer. Like any other minor mode, with a positive +numeric argument, it enables Auto Fill mode, and with a negative +argument it disables it. To enable Auto Fill mode automatically in +certain major modes, add @code{auto-fill-mode} to the mode hooks +(@pxref{Major Modes}). When Auto Fill mode is enabled, the mode +indicator @samp{Fill} appears in the mode line (@pxref{Mode Line}). Auto Fill mode breaks lines automatically at spaces whenever they get longer than the desired width. This line breaking occurs only commit d7d3b14a99692ffee6adb1c0b643a625bdcae650 Author: Andreas Schwab Date: Sun Dec 24 12:15:55 2017 +0100 * lisp/url/url-http.el (url-http-wait-for-headers-change-function): Change message to url-http-debug. diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 51f158e5c2..f9cf32cf04 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -1384,7 +1384,7 @@ The return value of this function is the retrieval buffer." (error "error: %s" e))) (error "error: gnutls support needed!"))) (t - (message "error response: %d" url-http-response-status) + (url-http-debug "error response: %d" url-http-response-status) (url-http-activate-callback)))))) (defun url-http-async-sentinel (proc why) commit f3819ad13e917583af57e3414687af0d2934dd72 Author: Alan Mackenzie Date: Sun Dec 24 10:29:52 2017 +0000 In C-h k , alert user to existence of any matching down-mouse-event , and instruct her to hold the mouse button to display its documentation. * lisp/help.el (help-downify-mouse-event-type): New function. (help-read-key-sequence, describe-key): handle double-click-time being nil or t. (describe-key): Print out instructions for displaying documentation of matching mouse down key sequence command when such exists. diff --git a/lisp/help.el b/lisp/help.el index dd1676adb0..fa7f6b0d5b 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -739,7 +739,11 @@ Describe the following key, mouse click, or menu item: ")) ;; spuriously trigger the `sit-for'. (sleep-for 0.01) (while (read-event nil nil 0.01)) - (not (sit-for (/ double-click-time 1000.0) t)))))))) + (not (sit-for + (if (numberp double-click-time) + (/ double-click-time 1000.0) + 3.0) + t)))))))) ;; When we have a sequence of mouse events, discard the most ;; recent ones till we find one with a binding. (let ((keys-1 keys)) @@ -788,6 +792,28 @@ Describe the following key, mouse click, or menu item: ")) (setq yank-menu (copy-sequence saved-yank-menu)) (fset 'yank-menu (cons 'keymap yank-menu)))))) +(defun help-downify-mouse-event-type (base) + "Add \"down-\" to BASE if it is not already there. +BASE is a symbol, a mouse event type. If the modification is done, +return the new symbol. Otherwise return nil." + (let ((base-s (symbol-name base))) + ;; Note: the order of the components in the following string is + ;; determined by `apply_modifiers_uncached' in src/keyboard.c. + (string-match "\\(A-\\)?\ +\\(C-\\)?\ +\\(H-\\)?\ +\\(M-\\)?\ +\\(S-\\)?\ +\\(s-\\)?\ +\\(double-\\)?\ +\\(triple-\\)?\ +\\(up-\\)?\ +\\(\\(down-\\)?\\)\ +\\(drag-\\)?" base-s) + (when (and (null (match-beginning 11)) ; "down-" + (null (match-beginning 12))) ; "drag-" + (intern (replace-match "down-" t t base-s 10)) ))) + (defun describe-key (&optional key untranslated up-event) "Display documentation of the function invoked by KEY. KEY can be any kind of a key sequence; it can include keyboard events, @@ -847,6 +873,25 @@ temporarily enables it to allow getting help on disabled items and buttons." (princ (format " (found in %s)" key-locus)))) (princ ", which is ") (describe-function-1 defn) + (when (vectorp key) + (let* ((last (1- (length key))) + (elt (aref key last)) + (elt-1 (copy-sequence elt)) + key-1 down-event-type) + (when (and (listp elt-1) + (symbolp (car elt-1)) + (setq down-event-type (help-downify-mouse-event-type + (car elt-1)))) + (setcar elt-1 down-event-type) + (setq key-1 (vector elt-1)) + (when (key-binding key-1) + (princ (format " + +For documentation of the corresponding mouse down event <%s>, +click and hold the mouse button longer than %s second(s)." + down-event-type (if (numberp double-click-time) + (/ double-click-time 1000.0) + 3))))))) (when up-event (unless (or (null defn-up) (integerp defn-up) commit 99054fbef96708054b737bbeaad0dcd0b23bb6e0 Author: Andreas Schwab Date: Sat Dec 23 21:38:36 2017 +0100 * net/eww.el (eww): Handle URLs without host part. diff --git a/lisp/net/eww.el b/lisp/net/eww.el index bff592c3fe..fcd2b98797 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -261,9 +261,10 @@ word(s) will be searched for via `eww-search-prefix'." ;; IDNA characters. If not, transform to punycode to indicate that ;; there may be funny business going on. (let ((parsed (url-generic-parse-url url))) - (unless (puny-highly-restrictive-domain-p (url-host parsed)) - (setf (url-host parsed) (puny-encode-domain (url-host parsed))) - (setq url (url-recreate-url parsed)))) + (when (url-host parsed) + (unless (puny-highly-restrictive-domain-p (url-host parsed)) + (setf (url-host parsed) (puny-encode-domain (url-host parsed))) + (setq url (url-recreate-url parsed))))) (plist-put eww-data :url url) (plist-put eww-data :title "") (eww-update-header-line-format) commit de89c0b6411c01e3ed58ac82e68b21cac985b7eb Author: Alan Mackenzie Date: Sat Dec 23 18:00:10 2017 +0000 Make C-h c/k S-mouse-1 display message for mouse-appearance-menu, etc. Currently, C-h c/k for S-mouse-1 reports that S-mouse-1 is unbound, ignoring that S-down-mouse-1 is bound. We fix this by reporting on the "latest" mouse event of a sequence which is bound. * lisp/help.el (help-read-key-sequence): Save all encountered mouse events in a list. Return the latest one which has a binding. diff --git a/lisp/help.el b/lisp/help.el index 212e3679da..dd1676adb0 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -717,7 +717,7 @@ with `mouse-movement' events." (cursor-in-echo-area t) saved-yank-menu) (unwind-protect - (let (key down-ev) + (let (key keys down-ev discarded-up) ;; If yank-menu is empty, populate it temporarily, so that ;; "Select and Paste" menu can generate a complete event. (when (null (cdr yank-menu)) @@ -731,6 +731,7 @@ Describe the following key, mouse click, or menu item: ")) (or (and no-mouse-movement (string-match "mouse-movement" keyname)) + (progn (push key keys) nil) (and (string-match "\\(mouse\\|down\\|click\\|drag\\)" keyname) (progn @@ -739,13 +740,31 @@ Describe the following key, mouse click, or menu item: ")) (sleep-for 0.01) (while (read-event nil nil 0.01)) (not (sit-for (/ double-click-time 1000.0) t)))))))) + ;; When we have a sequence of mouse events, discard the most + ;; recent ones till we find one with a binding. + (let ((keys-1 keys)) + (while (and keys-1 + (not (key-binding (car keys-1)))) + ;; If we discard the last event, and this was a mouse + ;; up, remember this. + (if (and (eq keys-1 keys) + (vectorp (car keys-1)) + (let* ((last-idx (1- (length (car keys-1)))) + (last (aref (car keys-1) last-idx))) + (and (eventp last) + (memq 'click (event-modifiers last))))) + (setq discarded-up t)) + (setq keys-1 (cdr keys-1))) + (if keys-1 + (setq key (car keys-1)))) (list key ;; If KEY is a down-event, read and include the ;; corresponding up-event. Note that there are also ;; down-events on scroll bars and mode lines: the actual ;; event then is in the second element of the vector. - (and (vectorp key) + (and (not discarded-up) ; Don't attempt to ignore the up-event twice. + (vectorp key) (let ((last-idx (1- (length key)))) (and (eventp (aref key last-idx)) (memq 'down (event-modifiers (aref key last-idx))))) commit 720ed0b5334c9667b2fdc4d3f5e8975865e9f962 Author: Eli Zaretskii Date: Sat Dec 23 13:59:07 2017 +0200 Avoid crashes when ':eval' deletes our frame * src/xdisp.c (display_mode_element): Signal an error if ':eval' somehow deletes the frame whose window we are redisplaying. (Bug#29726) diff --git a/src/xdisp.c b/src/xdisp.c index 538c3e6b87..f6e98daa32 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -23685,6 +23685,14 @@ display_mode_element (struct it *it, int depth, int field_width, int precision, { Lisp_Object spec; spec = safe__eval (true, XCAR (XCDR (elt))); + /* The :eval form could delete the frame stored in the + iterator, which will cause a crash if we try to + access faces and other fields (e.g., FRAME_KBOARD) + on that frame. This is a nonsensical thing to do, + and signaling an error from redisplay might be + dangerous, but we cannot continue with an invalid frame. */ + if (!FRAME_LIVE_P (it->f)) + signal_error (":eval deleted the frame being displayed", elt); n += display_mode_element (it, depth, field_width - n, precision - n, spec, props, risky); commit 9105c9aa3438773cf68cf40615b55db81d1e9480 Author: Tak Kunihiro Date: Sat Dec 23 11:16:40 2017 +0200 Fix scrolling up in pixel-scroll.el * lisp/pixel-scroll.el (pixel-scroll-up): Do not try to move cursor down when EOB is shown at the top. This function is reverted to commit 1bda71ec3b11eeb4d06c3da094a3cb21bac18d5c. (bug#29737) diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el index f64a4392b4..70244873b4 100644 --- a/lisp/pixel-scroll.el +++ b/lisp/pixel-scroll.el @@ -110,11 +110,11 @@ This is an alternative of `scroll-up'. Scope moves downward." pixel-resolution-fine-flag (frame-char-height)) (pixel-line-height)))) - (while (pixel-point-at-top-p amt) ; prevent too late (multi tries) - (vertical-motion 1)) ; move point downward - (if (pixel-eob-at-top-p) ; when end-of-the-buffer is close - (scroll-up 1) ; relay on robust method - (pixel-scroll-pixel-up amt))))) ; move scope downward + (if (pixel-eob-at-top-p) ; when end-of-the-buffer is close + (scroll-up 1) ; relay on robust method + (while (pixel-point-at-top-p amt) ; prevent too late (multi tries) + (vertical-motion 1)) ; move point downward + (pixel-scroll-pixel-up amt))))) ; move scope downward (defun pixel-scroll-down (&optional arg) "Scroll text of selected window down ARG lines. commit b882d4ef11b4d12cc16face4a0e80818045a2aa3 Author: Eli Zaretskii Date: Sat Dec 23 10:34:42 2017 +0200 Fix problems with ligatures in PDF version of ELisp manual * doc/lispref/strings.texi (Case Conversion): Avoid problems with ligatures in printed versions of the manual. (Bug#29818) diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 09c3bdf71f..24d3ee4587 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1197,6 +1197,7 @@ a character, functions are unable to perform proper substitution and result may differ compared to treating a one-character string. For example: +@ifnottex @example @group (upcase "fi") ; note: single character, ligature "fi" @@ -1207,6 +1208,19 @@ example: @result{} 64257 ; i.e. ?fi @end group @end example +@end ifnottex +@iftex +@example +@group +(upcase "fi") ; note: single character, ligature "fi" + @result{} "FI" +@end group +@group +(upcase ?fi) + @result{} 64257 ; i.e. ?fi +@end group +@end example +@end iftex To avoid this, a character must first be converted into a string, using @code{string} function, before being passed to one of the casing commit 289dd53bb3c139d4f282e5bc5dbfe066f9f026ab Author: Stefan Monnier Date: Fri Dec 22 16:00:07 2017 -0500 (elisp-flymake-byte-compile): Handle killed buffer in sentinel * lisp/progmodes/elisp-mode.el (elisp-flymake-byte-compile): Don't burp if the source-buffer has been killed. diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 4207edb8af..c3e73767f9 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -1699,9 +1699,11 @@ current buffer state and calls REPORT-FN when done." (when (eq (process-status proc) 'exit) (unwind-protect (cond - ((not (eq proc (with-current-buffer source-buffer - elisp-flymake--byte-compile-process))) - (flymake-log :warning "byte-compile process %s obsolete" proc)) + ((not (and (buffer-live-p source-buffer) + (eq proc (with-current-buffer source-buffer + elisp-flymake--byte-compile-process)))) + (flymake-log :warning + "byte-compile process %s obsolete" proc)) ((zerop (process-exit-status proc)) (elisp-flymake--byte-compile-done report-fn source-buffer commit cf36c821278414cad8584c690210577ad0a38e70 Author: Glenn Morris Date: Fri Dec 22 16:26:08 2017 -0500 Avoid some overfull lines in PDF lispref * doc/lispref/commands.texi (Reading One Event): * doc/lispref/display.texi (SVG Images): * doc/lispref/frames.texi (Size Parameters): * doc/lispref/syntax.texi (Categories): * doc/lispref/windows.texi (Frame Layouts with Side Windows): Avoid overfull lines. diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 16b58d3d3c..a958cfdcad 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -2634,9 +2634,9 @@ The return value is the matching value from @var{choices}. @lisp (read-multiple-choice "Continue connecting?" - '((?a "always" "Accept this certificate this session and for all future sessions.") - (?s "session only" "Accept this certificate this session only.") - (?n "no" "Refuse to use this certificate, and close the connection."))) + '((?a "always" "Accept certificate for this and future sessions.") + (?s "session only" "Accept certificate this session only.") + (?n "no" "Refuse to use certificate, close connection."))) @end lisp The @code{read-multiple-choice-face} face is used to highlight the diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 53c2014de0..bf70717e05 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5543,7 +5543,8 @@ inserts an image with a circle: @lisp (let ((svg (svg-create 400 400 :stroke-width 10))) (svg-gradient svg "gradient1" 'linear '((0 . "red") (100 . "blue"))) - (svg-circle svg 200 200 100 :gradient "gradient1" :stroke-color "green") + (svg-circle svg 200 200 100 :gradient "gradient1" + :stroke-color "green") (insert-image (svg-image svg))) @end lisp diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index edddbddfbf..1d4671b7e0 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1716,7 +1716,8 @@ file as, for example @example (setq default-frame-alist - '((fullscreen . fullboth) (fullscreen-restore . fullheight))) + '((fullscreen . fullboth) + (fullscreen-restore . fullheight))) @end example This will give a new frame full height after typing in it @key{F11} for diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index b37f2b22b8..566270fb52 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -1099,12 +1099,13 @@ bidi-class}). (let ((category-table (make-category-table)) ;; Create a char-table which gives the 'bidi-class' Unicode ;; property for each character. - (uniprop-table (unicode-property-table-internal 'bidi-class))) + (uniprop-table + (unicode-property-table-internal 'bidi-class))) (define-category ?R "Characters of bidi-class R, AL, or RLO" category-table) - ;; Modify the category entry of each character whose 'bidi-class' - ;; Unicode property is R, AL, or RLO -- these have a - ;; right-to-left directionality. + ;; Modify the category entry of each character whose + ;; 'bidi-class' Unicode property is R, AL, or RLO -- + ;; these have a right-to-left directionality. (map-char-table #'(lambda (key val) (if (memq val '(R AL RLO)) diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index d73b410f97..30a3c4a6eb 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -3391,7 +3391,8 @@ producing the frame layout sketched above. @example @group (defvar parameters - '(window-parameters . ((no-other-window . t) (no-delete-other-windows . t)))) + '(window-parameters . ((no-other-window . t) + (no-delete-other-windows . t)))) (setq fit-window-to-buffer-horizontally t) (setq window-resize-pixelwise t) @@ -3404,10 +3405,13 @@ producing the frame layout sketched above. ("\\*Tags List\\*" display-buffer-in-side-window (side . right) (slot . 0) (window-width . fit-window-to-buffer) (preserve-size . (t . nil)) ,parameters) - ("\\*\\(?:help\\|grep\\|Completions\\)\\*" display-buffer-in-side-window - (side . bottom) (slot . -1) (preserve-size . (nil . t)) ,parameters) + ("\\*\\(?:help\\|grep\\|Completions\\)\\*" + display-buffer-in-side-window + (side . bottom) (slot . -1) (preserve-size . (nil . t)) + ,parameters) ("\\*\\(?:shell\\|compilation\\)\\*" display-buffer-in-side-window - (side . bottom) (slot . 1) (preserve-size . (nil . t)) ,parameters))) + (side . bottom) (slot . 1) (preserve-size . (nil . t)) + ,parameters))) @end group @end example commit b07b56a3510748cfc47d2fbf97fb8e1f3070a16d Author: Glenn Morris Date: Fri Dec 22 16:24:24 2017 -0500 Avoid some overfull lines in PDF manual * doc/emacs/display.texi (Display Custom): * doc/emacs/search.texi (Other Repeating Search): * doc/emacs/text.texi (Quotation Marks): Avoid overfull lines. diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index da4e9a083f..6b8be48d84 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -495,6 +495,7 @@ must absolutely not match more than a portion of the first word of the diary entry. For example, the default value of @code{diary-european-date-forms} is: +@c backup line is a fraction too wide in PDF, but it looks ok. @example ((day "/" month "[^/0-9]") (day "/" month "/" year "[^0-9]") diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 5860bacb9d..28f6dae8ad 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1763,8 +1763,8 @@ Any other non-@code{nil} value is treated as @code{t}. @findex display-line-numbers-mode @findex global-display-line-numbers-mode @vindex display-line-numbers-type -A convenient way of turning on display of line numbers is @w{@kbd{M-x -display-line-numbers-mode @key{RET}}}. This mode has a globalized +The command @kbd{M-x display-line-numbers-mode} provides a +convenient way to turn on display of line numbers. This mode has a globalized variant, @code{global-display-line-numbers-mode}. The user option @code{display-line-numbers-type} controls which sub-mode of line-number display, described above, will these modes activate. diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index c4853686ae..d4b247847b 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1735,7 +1735,8 @@ a multi-file incremental search is activated automatically. @cindex match (face name) @vindex list-matching-lines-default-context-lines @vindex list-matching-lines-jump-to-current-line -@cindex list-matching-lines-current-line-face (face name) +@c Too long. +@c @cindex list-matching-lines-current-line-face (face name) @kindex M-s o @findex occur @item M-x occur diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 2f6ebed026..67c279a743 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -443,9 +443,10 @@ non-@code{nil}, and in programming-language strings if @code{nil} for @code{electric-quote-string} and @code{t} for the other variables. - Electric Quote mode is disabled by default. To toggle it, type -@kbd{M-x electric-quote-mode}. To toggle it in a single buffer, use -@kbd{M-x electric-quote-local-mode}. To suppress it for a single use, + Electric Quote mode is disabled by default. To toggle it in a +single buffer, use @kbd{M-x electric-quote-local-mode}. +To toggle it globally, type +@kbd{M-x electric-quote-mode}. To suppress it for a single use, type @kbd{C-q `} or @kbd{C-q '} instead of @kbd{`} or @kbd{'}. To insert a curved quote even when Electric Quote is disabled or inactive, you can type @kbd{C-x 8 [} for @t{‘}, @kbd{C-x 8 ]} for commit 6b3118f02583e3c1ba4855e2ce17945616596907 Author: Glenn Morris Date: Fri Dec 22 16:22:13 2017 -0500 * doc/emacs/arevert-xtra.texi (Auto Reverting the Buffer Menu): Fix ref. diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi index 936930e3b9..3adc87b8b5 100644 --- a/doc/emacs/arevert-xtra.texi +++ b/doc/emacs/arevert-xtra.texi @@ -47,7 +47,13 @@ explained in the corresponding sections. @subsection Auto Reverting the Buffer Menu If auto-reverting of non-file buffers is enabled, the Buffer Menu -(@pxref{Several Buffers}) automatically reverts every +@iftex +(@pxref{Several Buffers,,, emacs, the Emacs Manual}) +@end iftex +@ifnottex +(@pxref{Several Buffers}) +@end ifnottex +automatically reverts every @code{auto-revert-interval} seconds, whether there is a need for it or not. (It would probably take longer to check whether there is a need than to actually revert.) commit 7ffb7b1e013284bfccf262778a91198331f1eb2b Author: Glenn Morris Date: Fri Dec 22 13:45:46 2017 -0500 ; lispref nil/t markup fixes diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 50069e3d1d..53c2014de0 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -50,7 +50,7 @@ screen is corrupted. @defun redraw-frame &optional frame This function clears and redisplays frame @var{frame}. If @var{frame} -is omitted or nil, it redraws the selected frame. +is omitted or @code{nil}, it redraws the selected frame. @end defun Even more powerful is @code{redraw-display}: @@ -1994,7 +1994,7 @@ defaults to the selected one. If the optional argument @var{first} is an integer, it denotes the index (starting with 0) of the first line of @var{window}'s glyph matrix to be returned. Note that if @var{window} has a header line, the line with -index 0 is that header line. If @var{first} is nil, the first line to +index 0 is that header line. If @var{first} is @code{nil}, the first line to be considered is determined by the value of the optional argument @var{body}: If @var{body} is non-@code{nil}, this means to start with the first line of @var{window}'s body, skipping any header line, if @@ -2003,7 +2003,7 @@ present. Otherwise, this function will start with the first line of If the optional argument @var{last} is an integer, it denotes the index of the last line of @var{window}'s glyph matrix that shall be returned. -If @var{last} is nil, the last line to be considered is determined by +If @var{last} is @code{nil}, the last line to be considered is determined by the value of @var{body}: If @var{body} is non-@code{nil}, this means to use the last line of @var{window}'s body, omitting @var{window}'s mode line, if present. Otherwise, this means to use the last line of diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index ec75361ace..edddbddfbf 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1569,7 +1569,7 @@ window-system window in the stacking (Z-) order of the frame's display. If this is @code{above}, the frame's window-system window is displayed above all other window-system windows that do not have the @code{above} -property set. If this is nil, the frame's window is displayed below all +property set. If this is @code{nil}, the frame's window is displayed below all windows that have the @code{above} property set and above all windows that have the @code{below} property set. If this is @code{below}, the frame's window is displayed below all windows that do not have the @@ -1898,7 +1898,7 @@ These parameters supply forms of interactions between different frames. @item parent-frame If non-@code{nil}, this means that this frame is a child frame (@pxref{Child Frames}), and this parameter specifies its parent frame. -If nil, this means that this frame is a normal, top-level frame. +If @code{nil}, this means that this frame is a normal, top-level frame. @vindex delete-before, a frame parameter @item delete-before @@ -2120,7 +2120,7 @@ this parameter. If non-@code{nil}, this frame's window-system window is drawn without decorations, like the title, minimize/maximize boxes and external borders. This usually means that the window cannot be dragged, resized, -iconified, maximized or deleted with the mouse. If nil, the frame's +iconified, maximized or deleted with the mouse. If @code{nil}, the frame's window is usually drawn with all the elements listed above unless their display has been suspended via window manager settings. diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 8d56e022d8..b3c90af723 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -1634,7 +1634,7 @@ argument @var{b} is given, the result of this operation is stored into @end defun @defun bool-vector-subsetp a b -Return @code{t} if every @code{t} value in @var{a} is also t in +Return @code{t} if every @code{t} value in @var{a} is also @code{t} in @var{b}, @code{nil} otherwise. All arguments should be bool vectors of the same length. @end defun diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 5bee0f9d82..ad497a8b09 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -825,7 +825,7 @@ This function arranges for @var{watch-function} to be called whenever @var{operation} is a symbol representing the kind of change, one of: `set', `let', `unlet', `makunbound', and `defvaralias'. @var{where} is a buffer if the buffer-local value of the variable is -being changed, nil otherwise. +being changed, @code{nil} otherwise. @end defun @defun remove-variable-watch symbol watch-function @@ -2061,7 +2061,7 @@ identifying a connection and the application using this connection. Property names might be @code{:application}, @code{:protocol}, @code{:user} and @code{:machine}. The property value of @code{:application} is a symbol, all other property values are -strings. All properties are optional; if @var{criteria} is nil, it +strings. All properties are optional; if @var{criteria} is @code{nil}, it always applies. Example: @example @@ -2079,7 +2079,7 @@ always applies. Example: @end group @end example - If @var{criteria} is nil, it applies for all remote connections. + If @var{criteria} is @code{nil}, it applies for all remote connections. Therefore, the example above would be equivalent to @example