Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
14cf0430
Commit
14cf0430
authored
Mar 08, 2008
by
Dan Nicolaescu
Browse files
(diff-ignore-whitespace-hunk): Bind
inhibit-read-only before trying to change the buffer.
parent
4894c2b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/diff-mode.el
lisp/diff-mode.el
+1
-1
No files found.
lisp/ChangeLog
View file @
14cf0430
2008-03-08 Dan Nicolaescu <dann@ics.uci.edu>
* diff-mode.el (diff-ignore-whitespace-hunk): Bind
inhibit-read-only before trying to change the buffer.
2008-03-08 Glenn Morris <rgm@gnu.org>
* calendar/appt.el (appt): Move custom group here from calendar.el.
...
...
lisp/diff-mode.el
View file @
14cf0430
...
...
@@ -1695,13 +1695,13 @@ For use in `add-log-current-defun-function'."
(
line-nb
(
and
(
or
(
looking-at
"[^0-9]+\\([0-9]+\\)"
)
(
error
"Can't find line number"
))
(
string-to-number
(
match-string
1
))))
(
inhibit-read-only
t
)
(
hunk
(
delete-and-extract-region
(
point
)
(
save-excursion
(
diff-end-of-hunk
)
(
point
))))
(
lead
(
make-string
(
1-
line-nb
)
?\n
))
;Line nums start at 1.
(
file1
(
make-temp-file
"diff1"
))
(
file2
(
make-temp-file
"diff2"
))
(
coding-system-for-read
buffer-file-coding-system
)
(
inhibit-read-only
t
)
old
new
)
(
unwind-protect
(
save-excursion
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment