From 6cbdd048bda6f1fe1cb72e72627ee63ee3174b7d Mon Sep 17 00:00:00 2001 From: Mattias Engdegård Date: Sat, 4 Jan 2020 00:01:42 +0100 Subject: * lisp/autorevert.el (auto-revert-notify-handler): Fix bracketing. --- lisp/autorevert.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp') diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 7503fcc0264..3151b6e590d 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -733,8 +733,8 @@ system.") (null buffer-file-name)) (auto-revert-notify-rm-watch) ;; Restart the timer if it wasn't running. - (unless auto-revert-timer) - (auto-revert-set-timer)))) + (unless auto-revert-timer + (auto-revert-set-timer))))) ;; Loop over all buffers, in order to find the intended one. (cl-dolist (buffer buffers) -- cgit v1.2.3 From 28727444f1c12f0b5f1fffa4cfa66032f8f16c2d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 4 Jan 2020 14:00:39 +0100 Subject: Fix a scoping error in tramp-sudoedit.el * lisp/net/tramp-sudoedit.el (tramp-sudoedit-handle-file-system-info): Fix a scoping error. --- lisp/net/tramp-sudoedit.el | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'lisp') diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el index 18b30ad1f4e..08188cefde3 100644 --- a/lisp/net/tramp-sudoedit.el +++ b/lisp/net/tramp-sudoedit.el @@ -508,21 +508,21 @@ the result will be a local, non-Tramp, file name." (tramp-message v 5 "file system info: %s" localname) (when (tramp-sudoedit-send-command v "df" "--block-size=1" "--output=size,used,avail" - (tramp-compat-file-name-unquote localname))) - (with-current-buffer (tramp-get-connection-buffer v) - (goto-char (point-min)) - (forward-line) - (when (looking-at - (eval-when-compile - (concat "[[:space:]]*\\([[:digit:]]+\\)" - "[[:space:]]+\\([[:digit:]]+\\)" - "[[:space:]]+\\([[:digit:]]+\\)"))) - (list (string-to-number (match-string 1)) - ;; The second value is the used size. We need the - ;; free size. - (- (string-to-number (match-string 1)) - (string-to-number (match-string 2))) - (string-to-number (match-string 3)))))))) + (tramp-compat-file-name-unquote localname)) + (with-current-buffer (tramp-get-connection-buffer v) + (goto-char (point-min)) + (forward-line) + (when (looking-at + (eval-when-compile + (concat "[[:space:]]*\\([[:digit:]]+\\)" + "[[:space:]]+\\([[:digit:]]+\\)" + "[[:space:]]+\\([[:digit:]]+\\)"))) + (list (string-to-number (match-string 1)) + ;; The second value is the used size. We need the + ;; free size. + (- (string-to-number (match-string 1)) + (string-to-number (match-string 2))) + (string-to-number (match-string 3))))))))) (defun tramp-sudoedit-handle-set-file-times (filename &optional time) "Like `set-file-times' for Tramp files." -- cgit v1.2.3 From f95a2b83014a810d508448473b20186d55485efd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 4 Jan 2020 11:17:12 -0800 Subject: Fix some broken conditional forms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem reported by Mattias Engdegård in: https://lists.gnu.org/r/emacs-devel/2020-01/msg00088.html * lisp/cedet/ede/cpp-root.el (ede-create-lots-of-projects-under-dir): Remove this quick hack, which didn’t do anything anyway. * lisp/cedet/ede/pconf.el (ede-proj-configure-test-required-file): * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print-col): * lisp/net/nsm.el (nsm-check-tls-connection): Use ‘when’ rather than bypassing it. This doesn’t affect behavior and is better style. * lisp/cedet/srecode/semantic.el (srecode-semantic-handle-:tag): Fix typo that suppressed an error. * lisp/filesets.el (filesets-run-cmd): Fix typo that mishandled spacing. * lisp/gnus/gnus-cloud.el (gnus-cloud-update-newsrc-data): Fix typo that caused “GROUP has older different info in the cloud as of DATE, update it here?” prompt result to always be treated as “yes”. * lisp/gnus/mml-smime.el (mml-smime-openssl-encrypt): Simplify, since smime-encrypt-buffer signals error on failure. * lisp/international/titdic-cnv.el (tsang-quick-converter): Simplify. The conversion of this file to utf-8-emacs in 2019-01-08T02:18:40Z!monnier@iro.umontreal.ca removed the distinction between Big5 and CNS fulltitles in the generated docstring. * lisp/org/org-agenda.el (org-agenda-show-and-scroll-up): * lisp/textmodes/table.el (table--generate-source-cell-contents): Simplify by removing useless code. * lisp/org/ox-odt.el (org-odt--format-timestamp): Fix typo that always output time-of-day even when the timestamp lacked it. --- lisp/cedet/ede/cpp-root.el | 15 --------------- lisp/cedet/ede/pconf.el | 5 +++-- lisp/cedet/srecode/semantic.el | 2 +- lisp/emacs-lisp/tabulated-list.el | 8 ++++---- lisp/filesets.el | 2 +- lisp/gnus/gnus-cloud.el | 8 ++++---- lisp/gnus/mml-smime.el | 11 +++-------- lisp/international/titdic-cnv.el | 3 +-- lisp/net/nsm.el | 6 +++--- lisp/org/org-agenda.el | 1 - lisp/org/ox-odt.el | 2 +- lisp/textmodes/table.el | 6 +----- 12 files changed, 22 insertions(+), 47 deletions(-) (limited to 'lisp') diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index ee8aa5db1b7..f0dbccb7fc1 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el @@ -478,21 +478,6 @@ Argument COMMAND is the command to use for compiling the target." "Don't rescan this project from the sources." (message "cpp-root has nothing to rescan.")) -;;; Quick Hack -(defun ede-create-lots-of-projects-under-dir (dir projfile &rest attributes) - "Create a bunch of projects under directory DIR. -PROJFILE is a file name sans directory that indicates a subdirectory -is a project directory. -Generic ATTRIBUTES, such as :include-path can be added. -Note: This needs some work." - (let ((files (directory-files dir t))) - (dolist (F files) - (if (file-exists-p (expand-file-name projfile F)) - `(ede-cpp-root-project (file-name-nondirectory F) - :name (file-name-nondirectory F) - :file (expand-file-name projfile F) - attributes))))) - (provide 'ede/cpp-root) ;; Local variables: diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el index 63fb62b5a57..b85b397af2d 100644 --- a/lisp/cedet/ede/pconf.el +++ b/lisp/cedet/ede/pconf.el @@ -56,8 +56,9 @@ don't do it. A value of nil means to just do it.") (and (eq ede-pconf-create-file-query 'ask) (not (eq ede-pconf-create-file-query 'never)) (not (y-or-n-p - (format "I had to create the %s file for you. Ok? " file))) - (error "Quit"))))))) + (format "I had to create the %s file for you. Ok? " + file)))) + (error "Quit")))))) (cl-defmethod ede-proj-configure-synchronize ((this ede-proj-project)) diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el index 26c14892efd..5b2dd034743 100644 --- a/lisp/cedet/srecode/semantic.el +++ b/lisp/cedet/srecode/semantic.el @@ -201,7 +201,7 @@ variable default values, and other things." (let ((tag (or srecode-semantic-selected-tag (srecode-semantic-tag-from-kill-ring)))) (when (not tag) - "No tag for current template. Use the semantic kill-ring.") + (error "No tag for current template. Use the semantic kill-ring.")) (srecode-semantic-apply-tag-to-dict (srecode-semantic-tag (semantic-tag-name tag) :prime tag) diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index 501cc3a29e0..b13f609f882 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -547,10 +547,10 @@ Return the column number after insertion." ;; Don't truncate to `width' if the next column is align-right ;; and has some space left, truncate to `available-space' instead. (when (and not-last-col - (> label-width available-space) - (setq label (truncate-string-to-width - label available-space nil nil t t) - label-width available-space))) + (> label-width available-space)) + (setq label (truncate-string-to-width + label available-space nil nil t t) + label-width available-space)) (setq label (bidi-string-mark-left-to-right label)) (when (and right-align (> width label-width)) (let ((shift (- width label-width))) diff --git a/lisp/filesets.el b/lisp/filesets.el index 9834bcf0587..1ec0d24b539 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -1645,10 +1645,10 @@ Replace or <> with filename." (dolist (this args txt) (setq txt (concat txt + (if (equal txt "") "" " ") (filesets-run-cmd--repl-fn this (lambda (this) - (if (equal txt "") "" " ") (format "%s" this)))))))) (cmd (concat fn " " args))) (filesets-cmd-show-result diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el index cecfaef2f4f..4d8764bacca 100644 --- a/lisp/gnus/gnus-cloud.el +++ b/lisp/gnus/gnus-cloud.el @@ -243,10 +243,10 @@ Use old data if FORCE-OLDER is not nil." (when (or (not gnus-cloud-interactive) (gnus-y-or-n-p (format "%s has older different info in the cloud as of %s, update it here? " - group date)))) - (gnus-message 2 "Installing cloud update of group %s" group) - (gnus-set-info group contents) - (gnus-group-update-group group))) + group date))) + (gnus-message 2 "Installing cloud update of group %s" group) + (gnus-set-info group contents) + (gnus-group-update-group group)))) (gnus-error 1 "Sorry, group %s is not subscribed" group)) (gnus-error 1 "Sorry, could not update newsrc for group %s (invalid data %S)" group elem)))) diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index 3cc463d5d4c..4754f37a2da 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -154,14 +154,9 @@ Whether the passphrase is cached at all is controlled by (write-region (point-min) (point-max) file)) (push file certfiles) (push file tmpfiles))) - (if (smime-encrypt-buffer certfiles) - (progn - (while (setq tmp (pop tmpfiles)) - (delete-file tmp)) - t) - (while (setq tmp (pop tmpfiles)) - (delete-file tmp)) - nil)) + (smime-encrypt-buffer certfiles) + (while (setq tmp (pop tmpfiles)) + (delete-file tmp))) (goto-char (point-max))) (defvar gnus-extract-address-components) diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index 2a80d75fe7e..e95e399eda4 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -737,8 +737,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." ;; method is for inputting CNS characters. (defun tsang-quick-converter (dicbuf tsang-p big5-p) - (let ((fulltitle (if tsang-p (if big5-p "倉頡" "倉頡") - (if big5-p "簡易" "簡易"))) + (let ((fulltitle (if tsang-p "倉頡" "簡易")) dic) (goto-char (point-max)) (if big5-p diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index e94947bc7f1..1b0f04e5a19 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -311,9 +311,9 @@ See also: `network-security-protocol-checks' and `nsm-noninteractive'" (map-values results) "\n") "\n") - "\n* "))))) - (delete-process process) - (setq process nil))) + "\n* ")))))) + (delete-process process) + (setq process nil)) (run-hook-with-args 'nsm-tls-post-check-functions host port status settings results))) process) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 4f89ea54500..f45e47fb59a 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -8981,7 +8981,6 @@ fold drawers." (narrow-to-region (org-entry-beginning-position) (org-entry-end-position)) (org-show-all '(drawers)))) - (when arg ) (setq org-agenda-show-window (selected-window))) (select-window win))) diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el index 51cb42a49a5..a1486318a7d 100644 --- a/lisp/org/ox-odt.el +++ b/lisp/org/ox-odt.el @@ -940,7 +940,7 @@ See `org-odt--build-date-styles' for implementation details." (has-time-p (or (not timestamp) (org-timestamp-has-time-p timestamp))) (iso-date (let ((format (if has-time-p "%Y-%m-%dT%H:%M:%S" - "%Y-%m-%dT%H:%M:%S"))) + "%Y-%m-%d"))) (funcall format-timestamp timestamp format end)))) (if iso-date-p iso-date (let* ((style (if has-time-p "OrgDate2" "OrgDate1")) diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 4482e7d4d23..a33e9266b4b 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -3206,11 +3206,7 @@ CALS (DocBook DTD): (while (and (re-search-forward "$" nil t) (not (eobp))) (insert "
") - (forward-char 1))) - (unless (and table-html-delegate-spacing-to-user-agent - (progn - (goto-char (point-min)) - (looking-at "\\s *\\'"))))) + (forward-char 1)))) ((eq language 'cals) (table--remove-eol-spaces (point-min) (point-max)) (if (re-search-forward "\\s +\\'" nil t) -- cgit v1.2.3 From 7f01dfca5600fcd3e3548aee50734aab4b96b02f Mon Sep 17 00:00:00 2001 From: Stephen Gildea Date: Sat, 4 Jan 2020 15:28:07 -0800 Subject: Fix MH-E bug #470: Show buffer discards text properties * lisp/mh-e/mh-show.el (mh-display-msg): reset font lock and set major mode *before* formatting message content. This changes lets fonts work when the Show buffer is reused for a new message. (mh-show-mode): no longer set buffer-read-only; that is better done by mh-display-msg after setting all content. --- lisp/mh-e/mh-show.el | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lisp') diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el index 88710592831..952579fd3dd 100644 --- a/lisp/mh-e/mh-show.el +++ b/lisp/mh-e/mh-show.el @@ -221,6 +221,8 @@ Sets the current buffer to the show buffer." ;; pgp.el uses this. (if (boundp 'write-contents-hooks) ;Emacs 19 (kill-local-variable 'write-contents-hooks)) + (font-lock-mode -1) + (mh-show-mode) (if formfile (mh-exec-lib-cmd-output "mhl" "-nobell" "-noclear" (if (stringp formfile) @@ -232,7 +234,6 @@ Sets the current buffer to the show buffer." (mh-add-missing-mime-version-header) (setf (mh-buffer-data) (mh-make-buffer-data)) (mh-mime-display)) - (mh-show-mode) ;; Header cleanup (goto-char (point-min)) (cond (clean-message-header @@ -252,13 +253,11 @@ Sets the current buffer to the show buffer." (setq buffer-backed-up nil) (auto-save-mode 1) (set-mark nil) - (unwind-protect - (when (and mh-decode-mime-flag (not formfile)) - (setq buffer-read-only nil) - (mh-display-smileys) - (mh-display-emphasis)) - (setq buffer-read-only t)) + (when (and mh-decode-mime-flag (not formfile)) + (mh-display-smileys) + (mh-display-emphasis)) (set-buffer-modified-p nil) + (setq buffer-read-only t) (setq mh-show-folder-buffer folder) (setq mode-line-buffer-identification (list (format mh-show-buffer-mode-line-buffer-id @@ -870,7 +869,6 @@ See also `mh-folder-mode'. (easy-menu-add mh-show-folder-menu) (make-local-variable 'mh-show-folder-buffer) (buffer-disable-undo) - (setq buffer-read-only t) (use-local-map mh-show-mode-map)) -- cgit v1.2.3 From 448df8fec7a7fb3fe558749591e657e8a84cb46b Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sun, 5 Jan 2020 09:59:01 +0100 Subject: Improve doc-strings of 'quit-window' and 'quit-restore-window' (Bug#38819) * lisp/window.el (quit-restore-window, quit-window): Make doc-strings more consistent; add references to corresponding section of the Elisp manual (Bug#38819). --- lisp/window.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lisp') diff --git a/lisp/window.el b/lisp/window.el index 433486385d9..40c4bf5ad47 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4970,9 +4970,11 @@ WINDOW must be a live window and defaults to the selected one. According to information stored in WINDOW's `quit-restore' window parameter either (1) delete WINDOW and its frame, (2) delete -WINDOW, (3) restore the buffer previously displayed in WINDOW, -or (4) make WINDOW display some other buffer than the present -one. If non-nil, reset `quit-restore' parameter to nil. +WINDOW but leave its frame alone, (3) restore the buffer +previously shown in WINDOW, or (4) make WINDOW display some other +buffer. If WINDOW is not deleted, reset its `quit-restore' +parameter to nil. See Info node `(elisp) Quitting Windows' for +more details. Optional second argument BURY-OR-KILL tells how to proceed with the buffer of WINDOW. The following values are handled: @@ -5083,11 +5085,9 @@ WINDOW must be a live window and defaults to the selected one. With prefix argument KILL non-nil, kill the buffer instead of burying it. -According to information stored in WINDOW's `quit-restore' window -parameter either (1) delete WINDOW and its frame, (2) delete -WINDOW, (3) restore the buffer previously displayed in WINDOW, -or (4) make WINDOW display some other buffer than the present -one. If non-nil, reset `quit-restore' parameter to nil. +This calls the function `quit-restore-window' to delete WINDOW or +show some other buffer in it. See Info node `(elisp) Quitting +Windows' for more details. The functions in `quit-window-hook' will be run before doing anything else." -- cgit v1.2.3