aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2006-08-01 05:29:19 +0000
committerStefan Monnier2006-08-01 05:29:19 +0000
commitda95a9c86f7a15ac9bb23568a84a86920702f3e4 (patch)
tree66f7d9893644765fca55442ce14886639bd063e5
parentc534076ccd2f07aaeb8e22e1c825f40bbefd9e82 (diff)
downloademacs-da95a9c86f7a15ac9bb23568a84a86920702f3e4.tar.gz
emacs-da95a9c86f7a15ac9bb23568a84a86920702f3e4.zip
(longlines-show-region): Make it work on read-only buffers as well.
-rw-r--r--lisp/ChangeLog16
-rw-r--r--lisp/longlines.el11
2 files changed, 16 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4219388e72e..0540072e0c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
12006-08-01 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * longlines.el (longlines-show-region): Make it work on read-only
4 buffers as well.
5
12006-08-01 Nick Roberts <nickrob@snap.net.nz> 62006-08-01 Nick Roberts <nickrob@snap.net.nz>
2 7
3 * progmodes/gdb-ui.el (gdb-set-hollow): Check for 8 * progmodes/gdb-ui.el (gdb-set-hollow): Check for gud-last-last-frame.
4 gud-last-last-frame.
5 9
62006-07-31 Richard Stallman <rms@gnu.org> 102006-07-31 Richard Stallman <rms@gnu.org>
7 11
@@ -112,10 +116,10 @@
112 116
113 * tumme.el (tumme-track-original-file): Add `buffer-live-p' check. 117 * tumme.el (tumme-track-original-file): Add `buffer-live-p' check.
114 (tumme-format-properties-string): Handle empty `buf'. 118 (tumme-format-properties-string): Handle empty `buf'.
115 (tumme-get-comment): Change variable names inside `let'. Add 119 (tumme-get-comment): Change variable names inside `let'.
116 missing `let' variable that cause font-lock problems. 120 Add missing `let' variable that cause font-lock problems.
117 (tumme-write-comments): Change variable names inside `let'. Add 121 (tumme-write-comments): Change variable names inside `let'.
118 missing `let' variable that cause font-lock problems. 122 Add missing `let' variable that cause font-lock problems.
119 (tumme-forward-image): Rename from `tumme-forward-char'. 123 (tumme-forward-image): Rename from `tumme-forward-char'.
120 (tumme-backward-image): Rename from `tumme-backward-char'. 124 (tumme-backward-image): Rename from `tumme-backward-char'.
121 125
diff --git a/lisp/longlines.el b/lisp/longlines.el
index 9da3de217ab..77e0b415344 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -44,7 +44,7 @@
44 :group 'fill) 44 :group 'fill)
45 45
46(defcustom longlines-auto-wrap t 46(defcustom longlines-auto-wrap t
47 "*Non-nil means long lines are automatically wrapped after each command. 47 "Non-nil means long lines are automatically wrapped after each command.
48Otherwise, you can perform filling using `fill-paragraph' or 48Otherwise, you can perform filling using `fill-paragraph' or
49`auto-fill-mode'. In any case, the soft newlines will be removed 49`auto-fill-mode'. In any case, the soft newlines will be removed
50when the file is saved to disk." 50when the file is saved to disk."
@@ -52,7 +52,7 @@ when the file is saved to disk."
52 :type 'boolean) 52 :type 'boolean)
53 53
54(defcustom longlines-wrap-follows-window-size nil 54(defcustom longlines-wrap-follows-window-size nil
55 "*Non-nil means wrapping and filling happen at the edge of the window. 55 "Non-nil means wrapping and filling happen at the edge of the window.
56Otherwise, `fill-column' is used, regardless of the window size. This 56Otherwise, `fill-column' is used, regardless of the window size. This
57does not work well when the buffer is displayed in multiple windows 57does not work well when the buffer is displayed in multiple windows
58with differing widths." 58with differing widths."
@@ -60,7 +60,7 @@ with differing widths."
60 :type 'boolean) 60 :type 'boolean)
61 61
62(defcustom longlines-show-hard-newlines nil 62(defcustom longlines-show-hard-newlines nil
63 "*Non-nil means each hard newline is marked on the screen. 63 "Non-nil means each hard newline is marked on the screen.
64\(The variable `longlines-show-effect' controls what they look like.) 64\(The variable `longlines-show-effect' controls what they look like.)
65You can also enable the display temporarily, using the command 65You can also enable the display temporarily, using the command
66`longlines-show-hard-newlines'" 66`longlines-show-hard-newlines'"
@@ -68,7 +68,7 @@ You can also enable the display temporarily, using the command
68 :type 'boolean) 68 :type 'boolean)
69 69
70(defcustom longlines-show-effect (propertize "|\n" 'face 'escape-glyph) 70(defcustom longlines-show-effect (propertize "|\n" 'face 'escape-glyph)
71 "*A string to display when showing hard newlines. 71 "A string to display when showing hard newlines.
72This is used when `longlines-show-hard-newlines' is on." 72This is used when `longlines-show-hard-newlines' is on."
73 :group 'longlines 73 :group 'longlines
74 :type 'string) 74 :type 'string)
@@ -202,7 +202,8 @@ With optional argument ARG, make the hard newlines invisible again."
202 "Make hard newlines between BEG and END visible." 202 "Make hard newlines between BEG and END visible."
203 (let* ((pmin (min beg end)) 203 (let* ((pmin (min beg end))
204 (pmax (max beg end)) 204 (pmax (max beg end))
205 (pos (text-property-not-all pmin pmax 'hard nil))) 205 (pos (text-property-not-all pmin pmax 'hard nil))
206 (inhibit-read-only t))
206 (while pos 207 (while pos
207 (put-text-property pos (1+ pos) 'display 208 (put-text-property pos (1+ pos) 'display
208 (copy-sequence longlines-show-effect)) 209 (copy-sequence longlines-show-effect))