mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-29 19:48:19 +00:00
(next-line): Don't let `newline' expand abbrevs.
Simplify slightly. (open-line): Don't let `newline' expand abbrevs.
This commit is contained in:
parent
219227ead0
commit
207d7545b7
@ -1,3 +1,9 @@
|
||||
2001-01-26 Richard M. Stallman <rms@caffeine.ai.mit.edu>
|
||||
|
||||
* simple.el (next-line): Don't let `newline' expand abbrevs.
|
||||
Simplify slightly.
|
||||
(open-line): Don't let `newline' expand abbrevs.
|
||||
|
||||
2001-01-25 John Wiegley <johnw@gnu.org>
|
||||
|
||||
* eshell/esh-util.el (eshell-ange-ls-uids): Changed use of `alist'
|
||||
|
@ -141,7 +141,9 @@ With arg N, insert N newlines."
|
||||
(interactive "*p")
|
||||
(let* ((do-fill-prefix (and fill-prefix (bolp)))
|
||||
(do-left-margin (and (bolp) (> (current-left-margin) 0)))
|
||||
(loc (point)))
|
||||
(loc (point))
|
||||
;; Don't expand an abbrev before point.
|
||||
(abbrev-mode nil))
|
||||
(newline arg)
|
||||
(goto-char loc)
|
||||
(while (> arg 0)
|
||||
@ -2391,12 +2393,11 @@ using `forward-line' instead. It is usually easier to use
|
||||
and more reliable (no dependence on goal column, etc.)."
|
||||
(interactive "p")
|
||||
(if (and next-line-add-newlines (= arg 1))
|
||||
(let ((opoint (point)))
|
||||
(end-of-line)
|
||||
(if (eobp)
|
||||
(newline 1)
|
||||
(goto-char opoint)
|
||||
(line-move arg)))
|
||||
(if (save-excursion (end-of-line) (eobp))
|
||||
;; When adding a newline, don't expand an abbrev.
|
||||
(let ((abbrev-mode nil))
|
||||
(newline 1))
|
||||
(line-move arg))
|
||||
(if (interactive-p)
|
||||
(condition-case nil
|
||||
(line-move arg)
|
||||
|
Loading…
Reference in New Issue
Block a user