summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2008-02-15 16:32:39 +0000
committerBastien Guerry <bzg@altern.org>2008-02-15 16:32:39 +0000
commit6ad18d45df7f687f3eb3c2d18862e1717430a2cc (patch)
tree2e64d9672e42757363d652dd25a0ff2237fdcdda
parent1b6406b3b1a49da644698acd09ca94bb069c3ed3 (diff)
downloademacs-6ad18d45df7f687f3eb3c2d18862e1717430a2cc.tar.gz
2008-02-15 Lawrence Mitchell <wence@gmx.li> (tiny change)
* ielm.el (ielm-is-whitespace): Remove. (ielm-is-whitespace-or-comment): New function. (ielm-eval-input): Use it.
-rw-r--r--lisp/ielm.el10
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 764e78bc734..a9255587be5 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -300,9 +300,10 @@ simply inserts a newline."
;;; 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 @@ simply inserts a newline."
(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 @@ simply inserts a newline."
(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