Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
fca389d1
Commit
fca389d1
authored
Dec 05, 2014
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Plain Diff
Merge from emacs-24
parents
0c3f76c6
e97b6e6f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
18 deletions
+31
-18
admin/gitmerge.el
admin/gitmerge.el
+11
-14
lisp/ChangeLog
lisp/ChangeLog
+14
-0
lisp/progmodes/prog-mode.el
lisp/progmodes/prog-mode.el
+5
-3
lisp/simple.el
lisp/simple.el
+1
-1
No files found.
admin/gitmerge.el
View file @
fca389d1
...
...
@@ -90,6 +90,14 @@ Auto-commit"
map)
"
Keymap
for
gitmerge
major
mode.
")
(defvar gitmerge-mode-font-lock-keywords
`((,gitmerge-log-regexp
(1 font-lock-warning-face)
(2 font-lock-constant-face)
(3 font-lock-builtin-face)
(4 font-lock-comment-face))))
(defvar gitmerge--commits nil)
(defvar gitmerge--from nil)
...
...
@@ -459,23 +467,12 @@ Branch FROM will be prepended to the list."
(prog1 (read (buffer-string))
(kill-buffer)))))
(def
un gitmerge-mode ()
(def
ine-derived-mode gitmerge-mode special-mode "
gitmerge
"
"
Major
mode
for
Emacs
branch
merging.
"
(interactive)
(kill-all-local-variables)
(setq major-mode 'gitmerge-mode)
(setq mode-name "
gitmerge
")
(set-syntax-table text-mode-syntax-table)
(use-local-map gitmerge-mode-map)
(make-local-variable 'font-lock-defaults)
(setq gitmerge-mode-font-lock-keywords
(list (list gitmerge-log-regexp
'(1 font-lock-warning-face)
'(2 font-lock-constant-face)
'(3 font-lock-builtin-face)
'(4 font-lock-comment-face))))
(setq buffer-read-only t)
(setq font-lock-defaults '(gitmerge-mode-font-lock-keywords)))
(setq-local truncate-lines t)
(setq-local font-lock-defaults '(gitmerge-mode-font-lock-keywords)))
(defun gitmerge (from)
"
Merge
from
branch
FROM
into
`
default-directory
'.
"
...
...
lisp/ChangeLog
View file @
fca389d1
2014-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/prog-mode.el (prettify-symbols--compose-symbol):
Fix handling of symbols with different syntax at beginning/end or with
symbol rather than word syntax.
2014-12-05 Eli Zaretskii <eliz@gnu.org>
* simple.el (line-move): If noninteractive, call line-move-1, not
forward-line, since the former is compatible with line-move-visual
both in terms of the column to which it moves and the return
value. (Bug#19211)
2014-12-05 Stephen Berman <stephen.berman@gmx.net>
2014-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/ediff-init.el (ediff-odd-p): Remove.
...
...
lisp/progmodes/prog-mode.el
View file @
fca389d1
...
...
@@ -73,11 +73,13 @@ Regexp match data 0 points to the chars."
;; Check that the chars should really be composed into a symbol.
(
let*
((
start
(
match-beginning
0
))
(
end
(
match-end
0
))
(
syntaxes
(
if
(
eq
(
char-syntax
(
char-after
start
))
?w
)
(
syntaxes-beg
(
if
(
memq
(
char-syntax
(
char-after
start
))
'
(
?w
?_
))
'
(
?w
?_
)
'
(
?.
?\\
)))
(
syntaxes-end
(
if
(
memq
(
char-syntax
(
char-before
end
))
'
(
?w
?_
))
'
(
?w
?_
)
'
(
?.
?\\
)))
match
)
(
if
(
or
(
memq
(
char-syntax
(
or
(
char-before
start
)
?\s
))
syntaxes
)
(
memq
(
char-syntax
(
or
(
char-after
end
)
?\s
))
syntaxes
)
(
if
(
or
(
memq
(
char-syntax
(
or
(
char-before
start
)
?\s
))
syntaxes
-beg
)
(
memq
(
char-syntax
(
or
(
char-after
end
)
?\s
))
syntaxes
-end
)
;; syntax-ppss could modify the match data (bug#14595)
(
progn
(
setq
match
(
match-string
0
))
(
nth
8
(
syntax-ppss
))))
;; No composition for you. Let's actually remove any composition
...
...
lisp/simple.el
View file @
fca389d1
...
...
@@ -5541,7 +5541,7 @@ TRY-VSCROLL controls whether to vscroll tall lines: if either
`auto-window-vscroll' or TRY-VSCROLL is nil, this function will
not vscroll."
(if noninteractive
(
forward-line arg
)
(
line-move-1 arg noerror to-end
)
(unless (and auto-window-vscroll try-vscroll
;; Only vscroll for single line moves
(= (abs arg) 1)
...
...
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