aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-02-24 16:11:06 +0000
committerJuanma Barranquero2009-02-24 16:11:06 +0000
commit5f0e32eae1c50252096197728a2f0d8641bfda60 (patch)
treeeb724716c0ebf98c130e858a542ecef073e03f3f
parenta4bead12924447ab979dc70c922aaa2f4e44f90c (diff)
downloademacs-5f0e32eae1c50252096197728a2f0d8641bfda60.tar.gz
emacs-5f0e32eae1c50252096197728a2f0d8641bfda60.zip
* scroll-bar.el (scroll-bar-mode): Turn off scroll bars when
argument is 0. Doc fix. (Bug#1527)
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/scroll-bar.el6
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 692e63470c5..90e6a3ab99f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12009-02-24 Juanma Barranquero <lekktu@gmail.com> 12009-02-24 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * scroll-bar.el (scroll-bar-mode): Turn off scroll bars when
4 argument is 0. Doc fix. (Bug#1527)
5
3 * w32-vars.el (w32-system-shells): Doc fix. 6 * w32-vars.el (w32-system-shells): Doc fix.
4 7
5 * image.el (image-load-path-for-library, insert-sliced-image): 8 * image.el (image-load-path-for-library, insert-sliced-image):
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 37e7c0b65ce..eed6921b7e7 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -117,15 +117,15 @@ Setting the variable with a customization buffer also takes effect."
117 "Toggle display of vertical scroll bars on all frames. 117 "Toggle display of vertical scroll bars on all frames.
118This command applies to all frames that exist and frames to be 118This command applies to all frames that exist and frames to be
119created in the future. 119created in the future.
120With a numeric argument, if the argument is negative, 120With a numeric argument, if the argument is positive
121turn off scroll bars; otherwise, turn on scroll bars." 121turn on scroll bars; otherwise turn off scroll bars."
122 (interactive "P") 122 (interactive "P")
123 123
124 ;; Tweedle the variable according to the argument. 124 ;; Tweedle the variable according to the argument.
125 (set-scroll-bar-mode (if (if (null flag) 125 (set-scroll-bar-mode (if (if (null flag)
126 (not scroll-bar-mode) 126 (not scroll-bar-mode)
127 (setq flag (prefix-numeric-value flag)) 127 (setq flag (prefix-numeric-value flag))
128 (or (not (numberp flag)) (>= flag 0))) 128 (or (not (numberp flag)) (> flag 0)))
129 (or previous-scroll-bar-mode 129 (or previous-scroll-bar-mode
130 default-frame-scroll-bars)))) 130 default-frame-scroll-bars))))
131 131