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
baee695a
Commit
baee695a
authored
Sep 04, 2014
by
Rasmus Pank Roulund
Committed by
Stefan Monnier
Sep 04, 2014
Browse files
* lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status
returns nil. Fixes: debbugs:18391
parent
9bc6bb24
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
14 deletions
+19
-14
lisp/ChangeLog
lisp/ChangeLog
+18
-13
lisp/vc/vc-git.el
lisp/vc/vc-git.el
+1
-1
No files found.
lisp/ChangeLog
View file @
baee695a
2014-09-04 Rasmus Pank Roulund <emacs@pank.eu>
* vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status
returns nil (bug#18391).
2014-09-04 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/eldoc.el (eldoc-function-argstring): Don't strip
...
...
@@ -195,27 +200,27 @@
2014-08-24 Alan Mackenzie <acm@muc.de>
Handle C++11's "auto" and "decltype" constructions.
* progmodes/cc-engine.el (c-forward-type): Enhance to recognise
* progmodes/cc-engine.el (c-forward-type): Enhance to recognise
and return 'decltype.
(c-forward-decl-or-cast-1): New let variables backup-kwd-sym,
(c-forward-decl-or-cast-1): New let variables backup-kwd-sym,
prev-kwd-sym, new-style-auto. Enhance to handle the new "auto"
keyword.
* progmodes/cc-fonts.el (c-font-lock-declarations): Handle the
* progmodes/cc-fonts.el (c-font-lock-declarations): Handle the
"decltype" keyword.
(c-font-lock-c++-new): Handle "decltype" constructions.
* progmodes/cc-langs.el (c-auto-ops, c-auto-ops-re):
(c-font-lock-c++-new): Handle "decltype" constructions.
* progmodes/cc-langs.el (c-auto-ops, c-auto-ops-re):
New c-lang-defconsts/defvars.
(c-haskell-op, c-haskell-op-re): New c-lang-defconsts/defvars.
(c-typeof-kwds, c-typeof-key): New c-lang-defconsts/defvars.
(c-typeless-decl-kwds): Append "auto" onto the C++ value.
(c-not-decl-init-keywords): Also exclude c-typeof-kwds from value.
(c-haskell-op, c-haskell-op-re): New c-lang-defconsts/defvars.
(c-typeof-kwds, c-typeof-key): New c-lang-defconsts/defvars.
(c-typeless-decl-kwds): Append "auto" onto the C++ value.
(c-not-decl-init-keywords): Also exclude c-typeof-kwds from value.
Make ">>" act as double template ender in C++ Mode.
* progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split
* progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split
off from c->-op-cont-re.
(c->-op-cont-tokens): Change to use the above.
(c->-op-without->-cont-regexp): New lang-const.
* progmodes/cc-engine.el (c-forward-<>-arglist-recur):
(c->-op-cont-tokens): Change to use the above.
(c->-op-without->-cont-regexp): New lang-const.
* progmodes/cc-engine.el (c-forward-<>-arglist-recur):
Use c->-op-without->-cont-regexp in place of c->-op-cont-tokens.
...
...
lisp/vc/vc-git.el
View file @
baee695a
...
...
@@ -774,7 +774,7 @@ This prompts for a branch to merge from."
"
Return
the
list
of
files
with
conflicts
in
DIRECTORY.
"
(let* ((status
(vc-git--run-command-string directory "
status
" "
--porcelain
" "
--
"))
(lines (split-string status "
\n
" 'omit-nulls))
(lines
(when status
(split-string status "
\n
" 'omit-nulls))
)
files)
(dolist (line lines files)
(when (string-match "
\\
(
[
MADRCU?!][
MADRCU?!]\\
)
\\
(
.
+\\
)
\\
(
?:
->
\\
(
.
+\\
)
\\
)
?
"
...
...
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