Commit 93fe701d authored by Miles Bader's avatar Miles Bader
Browse files

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 12)

   - Update from CVS

2007-05-08  Richard M. Stallman  <rms@gnu.org>

   * lisp/mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook):
   Don't include non-self-insert commands in the exception for `-'.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-739
parents a57de0d4 75dcf19e
......@@ -38,6 +38,11 @@
* progmodes/python.el (python-end-of-block): Revert last change.
(python-end-of-statement): Make sure we move *forward*.
 
2007-05-08 Richard Stallman <rms@gnu.org>
* mail/mailabbrev.el (sendmail-pre-abbrev-expand-hook):
Don't include non-self-insert commands in the exception for `-'.
2007-05-08 David Reitter <david.reitter@gmail.com>
 
* progmodes/python.el (python-guess-indent): Check non-nullness
......@@ -494,6 +494,8 @@ of a mail alias. The value is set up, buffer-local, when first needed.")
;; the usual syntax table.
(or (and (integerp last-command-char)
;; Some commands such as M-> may want to expand first.
(equal this-command 'self-insert)
(or (eq (char-syntax last-command-char) ?_)
;; Don't expand on @.
(memq last-command-char '(?@ ?. ?% ?! ?_ ?-))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment