summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-01-30 21:39:40 -0500
committerGlenn Morris <rgm@gnu.org>2014-01-30 21:39:40 -0500
commitb7e615b9bc17a1e4a9ea0d4a71a87b64152af660 (patch)
treea8f7c02ffdfd13525a6f27dd9321c4f870d48d0e
parent0a25002dc2abfd77cd1c227942df3e77321d398d (diff)
downloademacs-b7e615b9bc17a1e4a9ea0d4a71a87b64152af660.tar.gz
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
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/mail/reporter.el7
-rw-r--r--lisp/progmodes/cc-mode.el1
3 files changed, 12 insertions, 3 deletions
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 <rgm@gnu.org>
+
+ * 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 <darren.hoo@gmail.com>
* 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))