# HG changeset patch # User Bastien Guerry # Date 1203093159 0 # Node ID 59ebf26b96e4f9be18c11775fc9461449aaee02e # Parent d317101e8648983c88774090f6bd908d127fbc0d 2008-02-15 Lawrence Mitchell (tiny change) * ielm.el (ielm-is-whitespace): Remove. (ielm-is-whitespace-or-comment): New function. (ielm-eval-input): Use it. diff -r d317101e8648 -r 59ebf26b96e4 lisp/ielm.el --- a/lisp/ielm.el Fri Feb 15 16:08:27 2008 +0000 +++ b/lisp/ielm.el Fri Feb 15 16:32:39 2008 +0000 @@ -300,9 +300,10 @@ ;;; Utility functions -(defun ielm-is-whitespace (string) +(defun ielm-is-whitespace-or-comment (string) "Return non-nil if STRING is all whitespace." - (or (string= string "") (string-match "\\`[ \t\n]+\\'" string))) + (or (string= string "") + (string-match "\\`[ \t\n]*\\(?:;.*\\)*\\'" string))) ;;; Evaluation @@ -327,7 +328,7 @@ (ielm-output "") ; result to display (ielm-wbuf ielm-working-buffer) ; current buffer after evaluation (ielm-pmark (ielm-pm))) - (if (not (ielm-is-whitespace ielm-string)) + (if (not (ielm-is-whitespace-or-comment ielm-string)) (progn (condition-case err (let (rout) @@ -342,7 +343,8 @@ (setq ielm-result "Working buffer has been killed" ielm-error-type "IELM Error" ielm-wbuf (current-buffer)) - (if (ielm-is-whitespace (substring ielm-string ielm-pos)) + (if (ielm-is-whitespace-or-comment + (substring ielm-string ielm-pos)) ;; To correctly handle the ielm-local variables *, ;; ** and ***, we need a temporary buffer to be ;; current at entry to the inner of the next two let