summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
2014-12-14 Dmitry Gutov <dgutov@yandex.ru>
+ * fringe.el (fringe-bitmap-p): Fix 2014-12-05 breakage.
+
+2014-12-14 Dmitry Gutov <dgutov@yandex.ru>
+
Move ASYNC argument to the `diff' VC command to the fifth
position, for better compatibility with existing third-party code,
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 @@
(defun fringe-bitmap-p (symbol)
"Return non-nil if SYMBOL is a fringe bitmap."
- `(get ,symbol 'fringe))
+ (get symbol 'fringe))
;; Control presence of fringes