summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2018-10-21 14:36:10 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2018-10-21 14:36:10 -0400
commit08192e40093bdbc8e6be6b283935b51c12d66eca (patch)
treea6ae55aa7ba3e403db9dd11d6a37058d764d89b0 /lisp/progmodes
parent17252062b03defe9eac6a510e88b87932ef400fe (diff)
downloademacs-08192e40093bdbc8e6be6b283935b51c12d66eca.tar.gz
emacs-08192e40093bdbc8e6be6b283935b51c12d66eca.tar.bz2
emacs-08192e40093bdbc8e6be6b283935b51c12d66eca.zip
Always define 'define-fringe-bitmap'
* lisp/cus-start.el: Test 'fringe-bitmaps' to see if fringe.c was compiled. * lisp/fringe.el: Use lexical-binding. (define-fringe-bitmap): Provide a fallback implementation. * lisp/progmodes/flymake.el (flymake-double-exclamation-mark): Define unconditionally. * lisp/progmodes/gdb-mi.el (define-fringe-bitmap): Don't declare any more. (breakpoint, hollow-right-triangle): Define unconditionally.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/flymake.el37
-rw-r--r--lisp/progmodes/gdb-mi.el16
2 files changed, 24 insertions, 29 deletions
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 60d1660e5fe..5831301a57c 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -219,25 +219,24 @@ Specifically, start it when the saved buffer is actually displayed."
:version "26.1"
:type 'boolean)
-(when (fboundp 'define-fringe-bitmap)
- (define-fringe-bitmap 'flymake-double-exclamation-mark
- (vector #b00000000
- #b00000000
- #b00000000
- #b00000000
- #b01100110
- #b01100110
- #b01100110
- #b01100110
- #b01100110
- #b01100110
- #b01100110
- #b01100110
- #b00000000
- #b01100110
- #b00000000
- #b00000000
- #b00000000)))
+(define-fringe-bitmap 'flymake-double-exclamation-mark
+ (vector #b00000000
+ #b00000000
+ #b00000000
+ #b00000000
+ #b01100110
+ #b01100110
+ #b01100110
+ #b01100110
+ #b01100110
+ #b01100110
+ #b01100110
+ #b01100110
+ #b00000000
+ #b01100110
+ #b00000000
+ #b00000000
+ #b00000000))
(defvar-local flymake-timer nil
"Timer for starting syntax check.")
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index da979de5400..32bdc315a42 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1741,16 +1741,12 @@ static char *magick[] = {
(defvar breakpoint-disabled-icon nil
"Icon for disabled breakpoint in display margin.")
-(declare-function define-fringe-bitmap "fringe.c"
- (bitmap bits &optional height width align))
-
-(and (display-images-p)
- ;; Bitmap for breakpoint in fringe
- (define-fringe-bitmap 'breakpoint
- "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")
- ;; Bitmap for gud-overlay-arrow in fringe
- (define-fringe-bitmap 'hollow-right-triangle
- "\xe0\x90\x88\x84\x84\x88\x90\xe0"))
+;; Bitmap for breakpoint in fringe
+(define-fringe-bitmap 'breakpoint
+ "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")
+;; Bitmap for gud-overlay-arrow in fringe
+(define-fringe-bitmap 'hollow-right-triangle
+ "\xe0\x90\x88\x84\x84\x88\x90\xe0")
(defface breakpoint-enabled
'((t