From: Glenn Morris Date: Fri, 31 Jan 2014 02:39:40 +0000 (-0500) Subject: Fix for c-submit-bug-report and reporter.el void-variable handling X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~223 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7e615b9bc17a1e4a9ea0d4a71a87b64152af660;p=emacs.git Fix for c-submit-bug-report and reporter.el void-variable handling * lisp/mail/reporter.el (reporter-dump-variable): In case of void-variable, do not mess with mail-buffer position (fixes 2009-11-03 change). * lisp/progmodes/cc-mode.el (c-submit-bug-report): Check auto-fill-mode is bound. Fixes: debbugs:16592 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c647ba0783b..3e8e7a6f3a8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-01-31 Glenn Morris + + * mail/reporter.el (reporter-dump-variable): In case of void-variable, + do not mess with mail-buffer position (fixes 2009-11-03 change). + * progmodes/cc-mode.el (c-submit-bug-report): + Check auto-fill-mode is bound. (Bug#16592) + 2014-01-31 Darren Hoo * startup.el (fancy-splash-image-file): New function, diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el index 35eb582bf77..8fa0121ea0a 100644 --- a/lisp/mail/reporter.el +++ b/lisp/mail/reporter.el @@ -200,9 +200,10 @@ MAILBUF is the mail buffer being composed." (insert "\n")) (void-variable (with-current-buffer mailbuf - (mail-position-on-field "X-Reporter-Void-Vars-Found") - (end-of-line) - (insert (symbol-name varsym) " "))) + (save-excursion + (mail-position-on-field "X-Reporter-Void-Vars-Found") + (end-of-line) + (insert (symbol-name varsym) " ")))) (error (error "")))) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index e961343713e..e8d447cd1fa 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1733,6 +1733,7 @@ Key bindings: filladapt-mode defun-prompt-regexp font-lock-mode + auto-fill-mode font-lock-maximum-decoration parse-sexp-lookup-properties lookup-syntax-properties))