diff options
| author | Eli Zaretskii | 2011-08-22 15:58:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-08-22 15:58:37 +0300 |
| commit | e59e73d83f5aa3705ebaaa2f1637b392f0b3e4f5 (patch) | |
| tree | 724f7ac8e0bd9832af2c39e481d8c1489aef7b91 | |
| parent | 56ee679c7f363b2ea9caf070535c0696a3af7b66 (diff) | |
| download | emacs-e59e73d83f5aa3705ebaaa2f1637b392f0b3e4f5.tar.gz emacs-e59e73d83f5aa3705ebaaa2f1637b392f0b3e4f5.zip | |
Back out inadvertent changes in minibuffer.el.
| -rw-r--r-- | lisp/minibuffer.el | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index b82147b97f1..313298de97e 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -1119,27 +1119,13 @@ It also eliminates runs of equal strings." | |||
| 1119 | `(display (space :align-to ,column))) | 1119 | `(display (space :align-to ,column))) |
| 1120 | nil)))) | 1120 | nil)))) |
| 1121 | (if (not (consp str)) | 1121 | (if (not (consp str)) |
| 1122 | (put-text-property (point) | 1122 | (put-text-property (point) (progn (insert str) (point)) |
| 1123 | (progn | ||
| 1124 | (insert (bidi-string-mark-left-to-right | ||
| 1125 | str)) | ||
| 1126 | (point)) | ||
| 1127 | 'mouse-face 'highlight) | 1123 | 'mouse-face 'highlight) |
| 1128 | (put-text-property (point) | 1124 | (put-text-property (point) (progn (insert (car str)) (point)) |
| 1129 | (progn | ||
| 1130 | (insert | ||
| 1131 | (bidi-string-mark-left-to-right | ||
| 1132 | (car str))) | ||
| 1133 | (point)) | ||
| 1134 | 'mouse-face 'highlight) | 1125 | 'mouse-face 'highlight) |
| 1135 | (add-text-properties (point) | 1126 | (add-text-properties (point) (progn (insert (cadr str)) (point)) |
| 1136 | (progn | ||
| 1137 | (insert | ||
| 1138 | (bidi-string-mark-left-to-right | ||
| 1139 | (cadr str))) | ||
| 1140 | (point)) | ||
| 1141 | '(mouse-face nil | 1127 | '(mouse-face nil |
| 1142 | face completions-annotations))) | 1128 | face completions-annotations))) |
| 1143 | (cond | 1129 | (cond |
| 1144 | ((eq completions-format 'vertical) | 1130 | ((eq completions-format 'vertical) |
| 1145 | ;; Vertical format | 1131 | ;; Vertical format |