commit/XEmacs: kehoea: Use a face, show more context around open parenthesis, #'blink-matching-open

1 new commit in XEmacs: https://bitbucket.org/xemacs/xemacs/commits/94a6b8fbd56e/ Changeset: 94a6b8fbd56e User: kehoea Date: 2013-12-17 19:49:52 Summary: Use a face, show more context around open parenthesis, #'blink-matching-open lisp/ChangeLog addition: 2013-12-17 Aidan Kehoe <kehoea(a)parhasard.net&gt; * simple.el (blink-matching-open): When showing the opening parenthesis in the minibiffer, use the isearch face for it, in case there are multiple parentheses in the text shown. When writing moderately involved macros, it's often not enough just to show the backquote context before the parenthesis (e.g. ＠,.`). Skip over that when searching for useful context in the same way we skip over space and tab. * simple.el (message): * simple.el (lmessage): If there are no ARGS, don't call #'format. This allows extent information to be passed through to the minibuffer. It's probably better still to update #'format to preserve extent info. Affected #: 2 files diff -r cd4f5f1f1f4c20036b18e7b7ab56c919614b9bea -r 94a6b8fbd56e98dd8d90de2b793cea1c5fd21353 lisp/ChangeLog --- a/lisp/ChangeLog +++ b/lisp/ChangeLog ＠＠ -1,3 +1,20 ＠＠ +2013-12-17 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * simple.el (blink-matching-open): + When showing the opening parenthesis in the minibiffer, use the + isearch face for it, in case there are multiple parentheses in the + text shown. + When writing moderately involved macros, it's often not enough + just to show the backquote context before the parenthesis + (e.g. ＠,.`). Skip over that when searching for useful context in + the same way we skip over space and tab. + * simple.el (message): + * simple.el (lmessage): + If there are no ARGS, don't call #'format. This allows extent + information to be passed through to the minibuffer. + It's probably better still to update #'format to preserve extent + info. + 2013-12-17 Aidan Kehoe <kehoea(a)parhasard.net&gt; * cl-extra.el: diff -r cd4f5f1f1f4c20036b18e7b7ab56c919614b9bea -r 94a6b8fbd56e98dd8d90de2b793cea1c5fd21353 lisp/simple.el --- a/lisp/simple.el +++ b/lisp/simple.el ＠＠ -3304,9 +3304,10 ＠＠ (save-excursion (save-restriction (if blink-matching-paren-distance - (narrow-to-region (max (point-min) - (- (point) blink-matching-paren-distance)) - oldpos)) + (narrow-to-region + (max (point-min) + (- (point) blink-matching-paren-distance)) + oldpos)) (condition-case () (let ((parse-sexp-ignore-comments (and parse-sexp-ignore-comments ＠＠ -3322,46 +3323,75 ＠＠ (matching-paren (char-after blinkpos)))))) (if mismatch (setq blinkpos nil)) (if blinkpos - (progn - (goto-char blinkpos) - (if (pos-visible-in-window-p) - (and blink-matching-paren-on-screen - (progn - (auto-show-make-point-visible) - (sit-for blink-matching-delay))) - (goto-char blinkpos) - (lmessage 'command "Matches %s" - ;; Show what precedes the open in its line, if anything. - (if (save-excursion - (skip-chars-backward " \t") - (not (bolp))) - (buffer-substring (progn (beginning-of-line) (point)) - (1+ blinkpos)) - ;; Show what follows the open in its line, if anything. - (if (save-excursion - (forward-char 1) - (skip-chars-forward " \t") - (not (eolp))) - (buffer-substring blinkpos - (progn (end-of-line) (point))) - ;; Otherwise show the previous nonblank line, - ;; if there is one. - (if (save-excursion - (skip-chars-backward "\n \t") - (not (bobp))) - (concat - (buffer-substring (progn - (skip-chars-backward "\n \t") - (beginning-of-line) - (point)) - (progn (end-of-line) - (skip-chars-backward " \t") - (point))) - ;; Replace the newline and other whitespace with `...'. - "..." - (buffer-substring blinkpos (1+ blinkpos))) - ;; There is nothing to show except the char itself. - (buffer-substring blinkpos (1+ blinkpos)))))))) + (labels + ((buffer-substring-highlight-blinkpos (start end) + ;; Sometimes there are sufficiently many + ;; parentheses on a line that it's *very* + ;; useful to see exactly which is the match. + (let* ((string (buffer-substring start end)) + (extent (make-extent (- blinkpos start) + (1+ (- blinkpos start)) + string))) + (set-extent-face extent 'isearch) + (set-extent-property extent 'duplicable t) + string)) + (before-backquote-context () + ;; Just showing the backquote context is often not + ;; informative enough, if you're writing vaguely + ;; complex macros. Move past it. + (skip-chars-backward "`,＠."))) + (declare (inline before-backquote-context)) + (goto-char blinkpos) + (if (pos-visible-in-window-p) + (and blink-matching-paren-on-screen + (progn + (auto-show-make-point-visible) + (sit-for blink-matching-delay))) + (goto-char blinkpos) + (lmessage + 'command + (concat + "Matches " + ;; Show what precedes the open in its line, if + ;; anything. + (if (save-excursion + (before-backquote-context) + (skip-chars-backward " \t") + (not (bolp))) + (buffer-substring-highlight-blinkpos + (progn (beginning-of-line) (point)) + (1+ blinkpos)) + ;; Show what follows the open in its line, if + ;; anything. + (if (save-excursion + (forward-char 1) + (skip-chars-forward " \t") + (not (eolp))) + (buffer-substring-highlight-blinkpos + (progn (before-backquote-context) (point)) + (progn (end-of-line (point)))) + ;; Otherwise show the previous nonblank line, + ;; if there is one. + (if (save-excursion + (skip-chars-backward "\n \t") + (not (bobp))) + (concat + (buffer-substring + (progn (skip-chars-backward "\n \t") + (beginning-of-line) + (point)) + (progn (end-of-line) + (skip-chars-backward " \t") + (point))) + ;; Replace the newline and other whitespace + ;; with `...'. + "..." + (buffer-substring-highlight-blinkpos + blinkpos (1+ blinkpos))) + ;; There is nothing to show except the char + ;; itself. + (buffer-substring-highlight-blinkpos + blinkpos (1+ blinkpos))))))))) (cond (mismatch (display-message 'no-log "Mismatched parentheses")) ((not blink-matching-paren-distance) ＠＠ -4501,9 +4531,9 ＠＠ (if (and (null fmt) (null args)) (prog1 nil (clear-message nil)) - (let ((str (apply 'format fmt args))) - (display-message 'message str) - str))) + (let ((string (if args (apply 'format fmt args) fmt))) + (display-message 'message string) + string))) (defun lmessage (label fmt &rest args) "Print a one-line message at the bottom of the frame. ＠＠ -4514,10 +4544,9 ＠＠ (if (and (null fmt) (null args)) (prog1 nil (clear-message label nil)) - (let ((str (apply 'format fmt args))) - (display-message label str) - str))) - + (let ((string (if args (apply 'format fmt args) fmt))) + (display-message label string) + string)))  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; warning code ;; Repository URL: https://bitbucket.org/xemacs/xemacs/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches