Commit 6aeafb34 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/electric.el (electric-indent-post-self-insert-function):

Don't reindent with a sloppy indentation function.
parent 2e664aab
2010-09-04 Stefan Monnier <monnier@iro.umontreal.ca> 2010-09-04 Stefan Monnier <monnier@iro.umontreal.ca>
   
* electric.el (electric-indent-post-self-insert-function):
Don't reindent with a sloppy indentation function.
* emacs-lisp/syntax.el (syntax-ppss): More sanity check to catch * emacs-lisp/syntax.el (syntax-ppss): More sanity check to catch
border case in change-log-mode. border case in change-log-mode.
   
...@@ -12,7 +15,7 @@ ...@@ -12,7 +15,7 @@
   
2010-09-04 Stefan Monnier <monnier@iro.umontreal.ca> 2010-09-04 Stefan Monnier <monnier@iro.umontreal.ca>
   
Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols. Avoid global recursive calls to kill-buffer-hooks; fit into 80 cols.
* textmodes/ispell.el (ispell-process-buffer-name): Remove. * textmodes/ispell.el (ispell-process-buffer-name): Remove.
(ispell-start-process): Avoid setq and simplify logic. (ispell-start-process): Avoid setq and simplify logic.
(ispell-init-process): Setup kill-buffer-hook locally when needed. (ispell-init-process): Setup kill-buffer-hook locally when needed.
......
...@@ -198,6 +198,10 @@ ...@@ -198,6 +198,10 @@
;; For newline, we want to reindent both lines and basically behave like ;; For newline, we want to reindent both lines and basically behave like
;; reindent-then-newline-and-indent (whose code we hence copied). ;; reindent-then-newline-and-indent (whose code we hence copied).
(when (and (eq last-command-event ?\n) (when (and (eq last-command-event ?\n)
;; Don't reindent the previous line if the indentation function
;; is not a real one.
(not (memq indent-line-function
'(indent-relative indent-relative-maybe)))
;; Sanity check. ;; Sanity check.
(eq (char-before) last-command-event)) (eq (char-before) last-command-event))
(let ((pos (copy-marker (1- (point)) t))) (let ((pos (copy-marker (1- (point)) t)))
......
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