commit 003071346cdc914f28a8e8b3a8bf0c8f5f3b52dc (HEAD, refs/remotes/origin/master) Author: Katsumi Yamaoka Date: Tue Apr 17 06:22:17 2018 +0000 * lisp/mail/sendmail.el (mail-sendmail-undelimit-header): Work for the case where the mail header separator has already been deleted. diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index ab6ac4b188..f1c6d39599 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -785,7 +785,9 @@ Concretely: replace the first blank line in the header with the separator." "Remove header separator to put the message in correct form for sendmail. Leave point at the start of the delimiter line." (goto-char (point-min)) - (when (re-search-forward (concat "^" (regexp-quote mail-header-separator) "\n")) + (when (re-search-forward + (concat "^" (regexp-quote mail-header-separator) "\n") + nil t) (replace-match "\n")) (rfc822-goto-eoh)) commit b0d261e29e5c1ffb9bc76e3519dd7525ab1edac4 Author: Lars Ingebrigtsen Date: Tue Apr 17 02:11:02 2018 +0200 (gnus-group-goto-group): Return correct value after previous patch * lisp/gnus/gnus-group.el (gnus-group-goto-group): Return the correct value after the previous patch. diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index a53adecd11..271c3c838b 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2607,11 +2607,13 @@ If TEST-MARKED, the line must be marked." found)) (t ;; Search through the entire buffer. - (unless (gnus-goto-char - (text-property-any - (point-min) (point-max) - 'gnus-group (gnus-intern-safe group gnus-active-hashtb))) - (goto-char start))))))) + (if (gnus-goto-char + (text-property-any + (point-min) (point-max) + 'gnus-group (gnus-intern-safe group gnus-active-hashtb))) + (point) + (goto-char start) + nil)))))) (defun gnus-group-next-group (n &optional silent) "Go to next N'th newsgroup. commit c8be645598a53423e4b30954a502f2cfcdf1b434 Author: Lars Ingebrigtsen Date: Mon Apr 16 23:10:03 2018 +0200 Fix inconsistent point movement in the Gnus group buffer * lisp/gnus/gnus-group.el (gnus-group-goto-group): If we can't find the group we're looking for, then don't move point at all (bug#23021). diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index d1f258fd92..a53adecd11 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2565,51 +2565,53 @@ If PROMPT (the prefix) is a number, use the prompt specified in If FAR, it is likely that the group is not on the current line. If TEST-MARKED, the line must be marked." (when group - (beginning-of-line) - (cond - ;; It's quite likely that we are on the right line, so - ;; we check the current line first. - ((and (not far) - (eq (get-text-property (point) 'gnus-group) - (gnus-intern-safe group gnus-active-hashtb)) - (or (not test-marked) (gnus-group-mark-line-p))) - (point)) - ;; Previous and next line are also likely, so we check them as well. - ((and (not far) - (save-excursion - (forward-line -1) - (and (eq (get-text-property (point) 'gnus-group) - (gnus-intern-safe group gnus-active-hashtb)) - (or (not test-marked) (gnus-group-mark-line-p))))) - (forward-line -1) - (point)) - ((and (not far) - (save-excursion - (forward-line 1) - (and (eq (get-text-property (point) 'gnus-group) - (gnus-intern-safe group gnus-active-hashtb)) - (or (not test-marked) (gnus-group-mark-line-p))))) - (forward-line 1) - (point)) - (test-marked - (goto-char (point-min)) - (let (found) - (while (and (not found) - (gnus-goto-char - (text-property-any - (point) (point-max) - 'gnus-group - (gnus-intern-safe group gnus-active-hashtb)))) - (if (gnus-group-mark-line-p) - (setq found t) - (forward-line 1))) - found)) - (t - ;; Search through the entire buffer. - (gnus-goto-char - (text-property-any - (point-min) (point-max) - 'gnus-group (gnus-intern-safe group gnus-active-hashtb))))))) + (let ((start (point))) + (beginning-of-line) + (cond + ;; It's quite likely that we are on the right line, so + ;; we check the current line first. + ((and (not far) + (eq (get-text-property (point) 'gnus-group) + (gnus-intern-safe group gnus-active-hashtb)) + (or (not test-marked) (gnus-group-mark-line-p))) + (point)) + ;; Previous and next line are also likely, so we check them as well. + ((and (not far) + (save-excursion + (forward-line -1) + (and (eq (get-text-property (point) 'gnus-group) + (gnus-intern-safe group gnus-active-hashtb)) + (or (not test-marked) (gnus-group-mark-line-p))))) + (forward-line -1) + (point)) + ((and (not far) + (save-excursion + (forward-line 1) + (and (eq (get-text-property (point) 'gnus-group) + (gnus-intern-safe group gnus-active-hashtb)) + (or (not test-marked) (gnus-group-mark-line-p))))) + (forward-line 1) + (point)) + (test-marked + (goto-char (point-min)) + (let (found) + (while (and (not found) + (gnus-goto-char + (text-property-any + (point) (point-max) + 'gnus-group + (gnus-intern-safe group gnus-active-hashtb)))) + (if (gnus-group-mark-line-p) + (setq found t) + (forward-line 1))) + found)) + (t + ;; Search through the entire buffer. + (unless (gnus-goto-char + (text-property-any + (point-min) (point-max) + 'gnus-group (gnus-intern-safe group gnus-active-hashtb))) + (goto-char start))))))) (defun gnus-group-next-group (n &optional silent) "Go to next N'th newsgroup. commit 36e5673753b985dee06b255be237dce9e96b0eb7 Author: Lars Ingebrigtsen Date: Mon Apr 16 21:20:08 2018 +0200 (artist-mode): Warn about proportional fonts * lisp/textmodes/artist.el (artist-mode): Warn about proportional fonts (bug#24175). diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index af7bcc77cd..7c261f8d2d 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -1401,7 +1401,9 @@ Keymap summary (artist-mode-exit)) (t ;; Turn mode on - (artist-mode-init)))) + (artist-mode-init) + (unless (font-get (face-attribute 'default :font) :spacing) + (message "The default font isn't monospaced, so the drawings in this buffer may look odd"))))) ;; Init and exit (defun artist-mode-init () commit e1a0cbbcf8389c76f67048e69139b5b0adf2cf38 Author: Lars Ingebrigtsen Date: Mon Apr 16 13:58:39 2018 +0200 Make mail-sendmail-undelimit-header actually remove the delimiter * lisp/mail/sendmail.el (mail-sendmail-undelimit-header): Actually remove the mail header separator (bug#17488). In all the cases where this is called, the separator will probably already have been removed, so the only thing this does is place point at the end of the headers. diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index c9f8fec1e1..ab6ac4b188 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -784,8 +784,10 @@ Concretely: replace the first blank line in the header with the separator." (defun mail-sendmail-undelimit-header () "Remove header separator to put the message in correct form for sendmail. Leave point at the start of the delimiter line." - (rfc822-goto-eoh) - (delete-region (point) (progn (end-of-line) (point)))) + (goto-char (point-min)) + (when (re-search-forward (concat "^" (regexp-quote mail-header-separator) "\n")) + (replace-match "\n")) + (rfc822-goto-eoh)) (defun mail-mode-auto-fill () "Carry out Auto Fill for Mail mode. commit 6ec3ec7fbec2c04d5e9570b0470217cd97e5e7e6 Author: Lars Ingebrigtsen Date: Mon Apr 16 13:47:53 2018 +0200 (semantic-symref-results-mode-map): Fix typo in previous check-in * lisp/cedet/semantic/symref/list.el (semantic-symref-results-mode-map): Fix typo in previous check-in. diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el index 31487d01c7..ab22d0d00a 100644 --- a/lisp/cedet/semantic/symref/list.el +++ b/lisp/cedet/semantic/symref/list.el @@ -114,7 +114,7 @@ Display the references in `semantic-symref-results-mode'." (define-key km "+" 'semantic-symref-list-toggle-showing) (define-key km "n" 'semantic-symref-list-next-line) (define-key km "p" 'semantic-symref-list-prev-line) - (define-key km "q" 'quit-buffer) + (define-key km "q" 'quit-window) (define-key km "\C-c\C-e" 'semantic-symref-list-expand-all) (define-key km "\C-c\C-r" 'semantic-symref-list-contract-all) (define-key km "R" 'semantic-symref-list-rename-open-hits)