aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2003-09-13 13:53:30 +0000
committerThien-Thi Nguyen2003-09-13 13:53:30 +0000
commit4a5717d19fff2cf44cec9a324167f7f787fce81b (patch)
treeb6e707983824547125241c2a828bc9d24aa9b54c
parente5f06fcebb1a15101ed2a862a1379889a71355d9 (diff)
downloademacs-4a5717d19fff2cf44cec9a324167f7f787fce81b.tar.gz
emacs-4a5717d19fff2cf44cec9a324167f7f787fce81b.zip
(Electric-pop-up-window): For the `one-window' case,
no longer disconcertingly move point in the original buffer.
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/electric.el1
2 files changed, 11 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e25b3873a74..b993f94fb6b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-09-13 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * electric.el (Electric-pop-up-window): For the `one-window' case,
4 no longer disconcertingly move point in the original buffer.
5
12003-09-13 Kevin Rodgers <ihs_4664@yahoo.com> (tiny change) 62003-09-13 Kevin Rodgers <ihs_4664@yahoo.com> (tiny change)
2 7
3 * hl-line.el: Documentation (comments-only) fix. 8 * hl-line.el: Documentation (comments-only) fix.
@@ -156,7 +161,7 @@
156 161
1572003-08-29 Richard M. Stallman <rms@gnu.org> 1622003-08-29 Richard M. Stallman <rms@gnu.org>
158 163
159 * mail/sendmail.el (sendmail-sync-aliases, mail-setup): 164 * mail/sendmail.el (sendmail-sync-aliases, mail-setup):
160 Do nothing with mail-personal-alias-file if it is nil. 165 Do nothing with mail-personal-alias-file if it is nil.
161 166
162 * mail/mailabbrev.el (mail-abbrevs-sync-aliases): 167 * mail/mailabbrev.el (mail-abbrevs-sync-aliases):
@@ -164,7 +169,7 @@
164 169
165 * term.el (term-exec-1): Bind coding-system-for-read. 170 * term.el (term-exec-1): Bind coding-system-for-read.
166 171
167 * dired.el (dired-mouse-find-file-other-window): 172 * dired.el (dired-mouse-find-file-other-window):
168 Use dired-view-command-alist here, as in dired-view-file. 173 Use dired-view-command-alist here, as in dired-view-file.
169 (dired-view-command-alist): Use %s to substitute file name. 174 (dired-view-command-alist): Use %s to substitute file name.
170 Handle .ps_pages, .eps, .jpg, .gif, .png. 175 Handle .ps_pages, .eps, .jpg, .gif, .png.
@@ -276,7 +281,7 @@
276 * calendar/diary-lib.el (simple-diary-display, make-diary-entry): 281 * calendar/diary-lib.el (simple-diary-display, make-diary-entry):
277 Allow the diary to pop up a new frame, if needed. 282 Allow the diary to pop up a new frame, if needed.
278 283
279 * mail/sendmail.el (mail-specify-envelope-from): Doc change. 284 * mail/sendmail.el (mail-specify-envelope-from): Doc change.
280 * mail/smtpmail.el (smtpmail-mail-address): Doc change. 285 * mail/smtpmail.el (smtpmail-mail-address): Doc change.
281 (smtpmail-send-it): Make treatment of envelope-from consistent with 286 (smtpmail-send-it): Make treatment of envelope-from consistent with
282 sendmail.el. 287 sendmail.el.
@@ -287,7 +292,7 @@
287 (sh-add-completer): Fix nil branch of case statement. 292 (sh-add-completer): Fix nil branch of case statement.
288 293
2892003-08-24 Masatake YAMATO <jet@gyve.org> 2942003-08-24 Masatake YAMATO <jet@gyve.org>
290 295
291 * progmodes/ld-script.el: New file. 296 * progmodes/ld-script.el: New file.
292 297
2932003-08-23 Markus Rost <rost@math.ohio-state.edu> 2982003-08-23 Markus Rost <rost@math.ohio-state.edu>
@@ -296,7 +301,7 @@
296 301
2972003-08-23 Andre Spiegel <spiegel@gnu.org> 3022003-08-23 Andre Spiegel <spiegel@gnu.org>
298 303
299 * vc-hooks.el (vc-ignore-vc-files, vc-master-templates): Better 304 * vc-hooks.el (vc-ignore-vc-files, vc-master-templates): Better
300 explain obsolescence, and what to use instead. 305 explain obsolescence, and what to use instead.
301 306
3022003-08-23 Masatake YAMATO <jet@gyve.org> 3072003-08-23 Masatake YAMATO <jet@gyve.org>
@@ -306,7 +311,7 @@
306 311
3072003-08-20 Dave Love <fx@gnu.org> 3122003-08-20 Dave Love <fx@gnu.org>
308 313
309 * international/mule.el (make-coding-system) 314 * international/mule.el (make-coding-system)
310 (set-buffer-file-coding-system): Doc fix. 315 (set-buffer-file-coding-system): Doc fix.
311 316
312 * emacs-lisp/lisp-mode.el (common-lisp-mode): New. 317 * emacs-lisp/lisp-mode.el (common-lisp-mode): New.
diff --git a/lisp/electric.el b/lisp/electric.el
index 776a99035cc..6df74eac6ef 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -160,7 +160,6 @@
160 (cond ((and (eq (window-buffer win) buf)) 160 (cond ((and (eq (window-buffer win) buf))
161 (select-window win)) 161 (select-window win))
162 (one-window 162 (one-window
163 (goto-char (window-start win))
164 (pop-to-buffer buffer) 163 (pop-to-buffer buffer)
165 (setq win (selected-window)) 164 (setq win (selected-window))
166 (enlarge-window (- target-height (window-height win)))) 165 (enlarge-window (- target-height (window-height win))))