[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117820: * lisp/vc/vc-git.el (vc-git-conflicted-file
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r117820: * lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status |
Date: |
Thu, 04 Sep 2014 16:34:52 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117820
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18391
author: Rasmus Pank Roulund <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2014-09-04 12:34:45 -0400
message:
* lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status
returns nil.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/vc/vc-git.el vcgit.el-20091113204419-o5vbwnq5f7feedwu-5070
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-09-04 15:23:37 +0000
+++ b/lisp/ChangeLog 2014-09-04 16:34:45 +0000
@@ -1,3 +1,8 @@
+2014-09-04 Rasmus Pank Roulund <address@hidden>
+
+ * vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status
+ returns nil (bug#18391).
+
2014-09-04 Stefan Monnier <address@hidden>
* emacs-lisp/eldoc.el (eldoc-function-argstring): Don't strip
@@ -195,27 +200,27 @@
2014-08-24 Alan Mackenzie <address@hidden>
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.
=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2014-08-25 16:48:08 +0000
+++ b/lisp/vc/vc-git.el 2014-09-04 16:34:45 +0000
@@ -774,7 +774,7 @@
"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?!]\\) \\(.+\\)\\(?: ->
\\(.+\\)\\)?"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117820: * lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status,
Stefan Monnier <=