diff options
| author | Eli Zaretskii | 2010-09-17 23:07:57 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-09-17 23:07:57 +0200 |
| commit | a67597d62dc993d95e45ffbb5862f92315f5914e (patch) | |
| tree | d8f9d98cfb32e6c18269bbd9183e27125cab1a44 | |
| parent | 283357a76d2f44c6899ea0456d5b8b97ece2055e (diff) | |
| download | emacs-a67597d62dc993d95e45ffbb5862f92315f5914e.tar.gz emacs-a67597d62dc993d95e45ffbb5862f92315f5914e.zip | |
Fix bug #6933 regarding `half' width fringes.
fringe.el (fringe-mode, fringe-query-style): Use 4 pixels, not
5, for `half' width fringes. (Bug#6933)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/fringe.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ced74de42a..cd44a207ce2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-09-17 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * fringe.el (fringe-mode, fringe-query-style): Use 4 pixels, not | ||
| 4 | 5, for `half' width fringes. (Bug#6933) | ||
| 5 | |||
| 1 | 2010-09-17 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-09-17 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/bytecomp.el (byte-compile-file-form-defvar) | 8 | * emacs-lisp/bytecomp.el (byte-compile-file-form-defvar) |
diff --git a/lisp/fringe.el b/lisp/fringe.el index 600ef7ca1e1..3763026514a 100644 --- a/lisp/fringe.el +++ b/lisp/fringe.el | |||
| @@ -153,7 +153,7 @@ you can use the interactive function `set-fringe-style'." | |||
| 153 | (const :tag "No fringes" 0) | 153 | (const :tag "No fringes" 0) |
| 154 | (const :tag "Only right" (0 . nil)) | 154 | (const :tag "Only right" (0 . nil)) |
| 155 | (const :tag "Only left" (nil . 0)) | 155 | (const :tag "Only left" (nil . 0)) |
| 156 | (const :tag "Half width" (5 . 5)) | 156 | (const :tag "Half width" (4 . 4)) |
| 157 | (const :tag "Minimal" (1 . 1)) | 157 | (const :tag "Minimal" (1 . 1)) |
| 158 | (integer :tag "Specific width") | 158 | (integer :tag "Specific width") |
| 159 | (cons :tag "Different left/right sizes" | 159 | (cons :tag "Different left/right sizes" |
| @@ -187,7 +187,7 @@ frame parameter is used." | |||
| 187 | ((eq mode 'default) nil) | 187 | ((eq mode 'default) nil) |
| 188 | ((eq mode 'left-only) '(nil . 0)) | 188 | ((eq mode 'left-only) '(nil . 0)) |
| 189 | ((eq mode 'right-only) '(0 . nil)) | 189 | ((eq mode 'right-only) '(0 . nil)) |
| 190 | ((eq mode 'half) '(5 . 5)) | 190 | ((eq mode 'half) '(4 . 4)) |
| 191 | ((eq mode 'minimal) '(1 . 1)) | 191 | ((eq mode 'minimal) '(1 . 1)) |
| 192 | ((eq mode (intern "")) | 192 | ((eq mode (intern "")) |
| 193 | (if (eq 0 (cdr (assq 'left-fringe | 193 | (if (eq 0 (cdr (assq 'left-fringe |