aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/cus-start.el2
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 996b70a4c34..f1cfd7a03ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-09-12 Romain Francoise <romain@orebokech.com>
2
3 * cus-start.el (all): Revert 2007-09-08 change.
4
12007-09-12 Aaron Hawley <aaronh@garden.org> 52007-09-12 Aaron Hawley <aaronh@garden.org>
2 6
3 * jka-cmpr-hook.el (jka-compr-compression-info-list): Use gzip to 7 * jka-cmpr-hook.el (jka-compr-compression-info-list): Use gzip to
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index d922329c62d..dd4a67812ca 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -359,8 +359,6 @@ since it could result in memory overflow and make Emacs crash."
359 (const :tag "Full screen (t)" :value t) 359 (const :tag "Full screen (t)" :value t)
360 (other :tag "Always" 1))) 360 (other :tag "Always" 1)))
361 (display-buffer-reuse-frames windows boolean "21.1") 361 (display-buffer-reuse-frames windows boolean "21.1")
362 (prefer-window-split-horizontally
363 windows (choice boolean integer) "22.1")
364 ;; xdisp.c 362 ;; xdisp.c
365 (scroll-step windows integer) 363 (scroll-step windows integer)
366 (scroll-conservatively windows integer) 364 (scroll-conservatively windows integer)