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
0f49941f
Commit
0f49941f
authored
May 10, 2001
by
Stefan Monnier
Browse files
(smerge-mode): Force font-lock-multiline to t.
parent
dd4e58c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
lisp/ChangeLog
lisp/ChangeLog
+12
-9
lisp/smerge-mode.el
lisp/smerge-mode.el
+2
-1
No files found.
lisp/ChangeLog
View file @
0f49941f
2001-05-10 Stefan Monnier <monnier@cs.yale.edu>
* smerge-mode.el (smerge-mode): Force font-lock-multiline to t.
2001-05-10 Eli Zaretskii <eliz@is.elta.co.il>
* mail/emacsbug.el (report-emacs-bug): Don't switch the buffer to
...
...
@@ -6,13 +10,12 @@
2001-05-10 Gerd Moellmann <gerd@gnu.org>
* net/browse-url.el (browse-url-filename-alist): Allow UNC file
names for MS-Windows and MS-DOS. From Dan Holmsand
<dan@eyebee.com>.
names for MS-Windows and MS-DOS. From Dan Holmsand <dan@eyebee.com>.
2001-05-09 John Wiegley <johnw@gnu.org>
* eshell/esh-util.el (eshell-convert-numeric-arguments):
Annotated
the documentation string to tell users about
* eshell/esh-util.el (eshell-convert-numeric-arguments):
Annotated
the documentation string to tell users about
`eshell-no-numeric-conversions'.
* eshell/esh-cmd.el (eshell-lisp-command): Don't perform numeric
...
...
@@ -30,7 +33,7 @@
eshell/which, eshell/addpath.
2001-05-09 John Wiegley <johnw@gnu.org>
* eshell/esh-arg.el (eshell-parse-argument-hook): If a number is
encountered as an argument, don't convert it right away, but tag
the first character of the string with the text properties
...
...
@@ -52,14 +55,14 @@
(eshell-proc-initialize): Don't bind keys for
`eshell-stop-process' or `eshell-continue-process'.
* eshell/em-unix.el (eshell-shuffle-files):
Apply
`directory-file-name' before calling `file-name-directory'.
* eshell/em-unix.el (eshell-shuffle-files):
Apply
`directory-file-name' before calling `file-name-directory'.
* eshell/em-hist.el (eshell-add-to-history): Reference to
`eshell-history-ring' needed to be `eshell-history-index'.
* calendar/timeclock.el (timeclock-find-discrep):
Initialize
`elapsed' to 0.
* calendar/timeclock.el (timeclock-find-discrep):
Initialize
`elapsed' to 0.
(timeclock-find-discrep): Set `timeclock-last-event-workday' if
it's still nil.
...
...
lisp/smerge-mode.el
View file @
0f49941f
...
...
@@ -4,7 +4,7 @@
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: merge diff3 cvs conflict
;; Revision: $Id: smerge-mode.el,v 1.1
1
2001/0
1/25 15:36:32
monnier Exp $
;; Revision: $Id: smerge-mode.el,v 1.1
2
2001/0
3/07 00:16:29
monnier Exp $
;; This file is part of GNU Emacs.
...
...
@@ -466,6 +466,7 @@ The point is moved to the end of the conflict."
\\{smerge-mode-map}"
nil
" SMerge"
nil
(
when
font-lock-mode
(
set
(
make-local-variable
'font-lock-multiline
)
t
)
(
save-excursion
(
if
smerge-mode
(
font-lock-add-keywords
nil
smerge-font-lock-keywords
'append
)
...
...
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