aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2014-12-14 12:51:52 +0200
committerDmitry Gutov2014-12-14 12:51:52 +0200
commit9f28cb59dc77213e1496f4ded40017739d734114 (patch)
tree1df3c1ade1f48382bde3c16890238a14460e8eb5
parent01b97f9df2d94e1e1c31517e084bf8d76174e1d4 (diff)
downloademacs-9f28cb59dc77213e1496f4ded40017739d734114.tar.gz
emacs-9f28cb59dc77213e1496f4ded40017739d734114.zip
* lisp/fringe.el (fringe-bitmap-p): Fix 2014-12-05 breakage.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/fringe.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb43a9b732f..75e84765320 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12014-12-14 Dmitry Gutov <dgutov@yandex.ru> 12014-12-14 Dmitry Gutov <dgutov@yandex.ru>
2 2
3 * fringe.el (fringe-bitmap-p): Fix 2014-12-05 breakage.
4
52014-12-14 Dmitry Gutov <dgutov@yandex.ru>
6
3 Move ASYNC argument to the `diff' VC command to the fifth 7 Move ASYNC argument to the `diff' VC command to the fifth
4 position, for better compatibility with existing third-party code, 8 position, for better compatibility with existing third-party code,
5 and document it. 9 and document it.
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 97a03936080..51d6543a3f6 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -85,7 +85,7 @@
85 85
86(defun fringe-bitmap-p (symbol) 86(defun fringe-bitmap-p (symbol)
87 "Return non-nil if SYMBOL is a fringe bitmap." 87 "Return non-nil if SYMBOL is a fringe bitmap."
88 `(get ,symbol 'fringe)) 88 (get symbol 'fringe))
89 89
90 90
91;; Control presence of fringes 91;; Control presence of fringes