branch: elpa/popup
commit 46632ab9652dacad56fd961cd6def25a015170ae
Merge: 2687612 51b3f59
Author: Tomohiro Matsuyama <m2ym....@gmail.com>
Commit: Tomohiro Matsuyama <m2ym....@gmail.com>
Merge pull request #93 from auto-complete/fix-for-24.5
Fix for Emacs 24.5 issue
---
popup.el | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/popup.el b/popup.el
index d197f8c..392833b 100644
--- a/popup.el
+++ b/popup.el
@@ -378,16 +378,15 @@ usual."
(put-text-property start (length content) 'face face content))
(when mouse-face
(put-text-property 0 (length content) 'mouse-face mouse-face content))
- (unless (overlay-get overlay 'dangle)
- (overlay-put overlay 'display (concat prefix (substring content 0 1)))
- (setq prefix nil
- content (concat (substring content 1))))
- (overlay-put overlay
- 'after-string
- (concat prefix
- content
- scroll-bar-char
- postfix))))
+ (let ((prop (if (overlay-get overlay 'dangle)
+ 'after-string
+ 'display)))
+ (overlay-put overlay
+ prop
+ (concat prefix
+ content
+ scroll-bar-char
+ postfix)))))
(cl-defun popup-create-line-string (popup
string
