diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio.el | 2 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 32 | ||||
| -rw-r--r-- | lisp/progmodes/autoconf.el | 3 |
4 files changed, 25 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 27dd6689746..e4a9be99d5c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-11-16 Chong Yidong <cyd@gnu.org> + + * progmodes/autoconf.el (autoconf-mode): Fix comment-start-skip + regexp (Bug#10033). + 2011-11-16 Stefan Monnier <monnier@iro.umontreal.ca> * tmm.el (tmm-prompt): Use minibuffer-with-setup-hook (bug#10053). diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 62325d51902..5e29a85d386 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -3051,7 +3051,7 @@ Optional argument GROUP is the sub-group of slots to display. ;;;### (autoloads (eieio-help-mode-augmentation-maybee eieio-describe-generic ;;;;;; eieio-describe-constructor eieio-describe-class eieio-browse) -;;;;;; "eieio-opt" "eieio-opt.el" "1bed0a56310f402683419139ebc18d7f") +;;;;;; "eieio-opt" "eieio-opt.el" "4fb6625c3a007438aab4e8e77b6c73c2") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 50d226978b4..786003e693f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4494,27 +4494,29 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "a79f498959deded8fa9d88a7dca93bc0") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "6296f0170a37670c49a88a1b92d78187") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ -Toggle displaying of a MIME message. +Toggle the display of a MIME message. The actual behavior depends on the value of `rmail-enable-mime'. -If `rmail-enable-mime' is non-nil (default), this command changes the -display of a MIME message between decoded presentation form and raw data. - -With ARG, toggle the display of the current MIME entity only. - -If `rmail-enable-mime' is nil, this creates a temporary -\"*RMAIL*\" buffer holding a decoded copy of the message. Inline -content-types are handled according to -`rmail-mime-media-type-handlers-alist'. By default, this -displays text and multipart messages, and offers to download -attachments as specified by `rmail-mime-attachment-dirs-alist'. - -\(fn &optional ARG)" t nil) +If `rmail-enable-mime' is non-nil (the default), this command toggles +the display of a MIME message between decoded presentation form and +raw data. With optional prefix argument ARG, it toggles the display only +of the MIME entity at point, if there is one. The optional argument +STATE forces a particular display state, rather than toggling. +`raw' forces raw mode, any other non-nil value forces decoded mode. + +If `rmail-enable-mime' is nil, this creates a temporary \"*RMAIL*\" +buffer holding a decoded copy of the message. Inline content-types are +handled according to `rmail-mime-media-type-handlers-alist'. +By default, this displays text and multipart messages, and offers to +download attachments as specified by `rmail-mime-attachment-dirs-alist'. +The arguments ARG and STATE have no effect in this case. + +\(fn &optional ARG STATE)" t nil) ;;;*** diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index 3aa9a6cfb87..fce725c3b3c 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -83,7 +83,8 @@ searching backwards at another AC_... command." (set (make-local-variable 'defun-prompt-regexp) "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+") (set (make-local-variable 'comment-start) "dnl ") - (set (make-local-variable 'comment-start-skip) "\\(?:\\<dnl\\|#\\) +") + (set (make-local-variable 'comment-start-skip) + "\\(?:\\(\\W\\|\\`\\)dnl\\|#\\) +") (set (make-local-variable 'syntax-propertize-function) (syntax-propertize-rules ("\\<dnl\\>" (0 "<")))) (set (make-local-variable 'font-lock-defaults) |