[slime-cvs] CVS slime
CVS User heller
heller at common-lisp.net
Thu May 27 14:47:48 UTC 2010
Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv5890
Modified Files:
ChangeLog slime.el
Log Message:
* slime.el (slime-defun-if-undefined): Renamed from
slime-DEFUN-if-undefined. No need to yell.
--- /project/slime/cvsroot/slime/ChangeLog 2010/05/27 14:47:39 1.2095
+++ /project/slime/cvsroot/slime/ChangeLog 2010/05/27 14:47:48 1.2096
@@ -1,5 +1,10 @@
2010-05-26 Helmut Eller <heller at common-lisp.net>
+ * slime.el (slime-defun-if-undefined): Renamed from
+ slime-DEFUN-if-undefined. No need to yell.
+
+2010-05-26 Helmut Eller <heller at common-lisp.net>
+
* slime.el (slime-compile-file): Only send non-nil keyword args.
(slime-hack-quotes): New function.
--- /project/slime/cvsroot/slime/slime.el 2010/05/27 14:47:39 1.1320
+++ /project/slime/cvsroot/slime/slime.el 2010/05/27 14:47:48 1.1321
@@ -2593,7 +2593,7 @@
(message "Compiling %s..." file)))
(defun slime-hack-quotes (arglist)
- ;; eval is the wrong primitive, we rally want funcall
+ ;; eval is the wrong primitive, we really want funcall
(loop for arg in arglist collect `(quote ,arg)))
(defun slime-simplify-plist (plist)
@@ -8826,24 +8826,23 @@
(assert (stringp result))
result)))
-(defmacro slime-DEFUN-if-undefined (name &rest rest)
+(defmacro slime-defun-if-undefined (name &rest rest)
;; We can't decide at compile time whether NAME is properly
;; bound. So we delay the decision to runtime to ensure some
;; definition
`(unless (fboundp ',name)
(defun ,name , at rest)))
-(put 'slime-DEFUN-if-undefined 'lisp-indent-function 2)
-(put 'slime-indulge-pretty-colors 'slime-DEFUN-if-undefined t)
+(put 'slime-defun-if-undefined 'lisp-indent-function 2)
+(put 'slime-indulge-pretty-colors 'slime-defun-if-undefined t)
;; FIXME: defining macros here is probably too late for the compiler
-(defmacro slime-DEFMACRO-if-undefined (name &rest rest)
+(defmacro slime-defmacro-if-undefined (name &rest rest)
`(unless (fboundp ',name)
(defmacro ,name , at rest)))
-(put 'slime-DEFMACRO-if-undefined 'lisp-indent-function 2)
-(put 'slime-indulge-pretty-colors 'slime-DEFMACRO-if-undefined t)
-
+(put 'slime-defmacro-if-undefined 'lisp-indent-function 2)
+(put 'slime-indulge-pretty-colors 'slime-defmacro-if-undefined t)
(defvar slime-accept-process-output-supports-floats
(ignore-errors (accept-process-output nil 0.0) t))
@@ -8883,9 +8882,9 @@
(apply #'run-hooks hooks)))
(if (featurep 'xemacs)
- (slime-DEFUN-if-undefined line-number-at-pos (&optional pos)
+ (slime-defun-if-undefined line-number-at-pos (&optional pos)
(line-number pos))
- (slime-DEFUN-if-undefined line-number-at-pos (&optional pos)
+ (slime-defun-if-undefined line-number-at-pos (&optional pos)
(save-excursion
(when pos (goto-char pos))
(1+ (count-lines 1 (point-at-bol))))))
@@ -8893,16 +8892,16 @@
(defun slime-local-variable-p (var &optional buffer)
(local-variable-p var (or buffer (current-buffer)))) ; XEmacs
-(slime-DEFUN-if-undefined region-active-p ()
+(slime-defun-if-undefined region-active-p ()
(and transient-mark-mode mark-active))
(if (featurep 'xemacs)
- (slime-DEFUN-if-undefined use-region-p ()
+ (slime-defun-if-undefined use-region-p ()
(region-active-p))
- (slime-DEFUN-if-undefined use-region-p ()
+ (slime-defun-if-undefined use-region-p ()
(and transient-mark-mode mark-active)))
-(slime-DEFUN-if-undefined next-single-char-property-change
+(slime-defun-if-undefined next-single-char-property-change
(position prop &optional object limit)
(let ((limit (typecase limit
(null nil)
@@ -8922,7 +8921,7 @@
(get-char-property pos prop object)))
return pos))))))
-(slime-DEFUN-if-undefined previous-single-char-property-change
+(slime-defun-if-undefined previous-single-char-property-change
(position prop &optional object limit)
(let ((limit (typecase limit
(null nil)
@@ -8945,27 +8944,27 @@
(get-char-property (1- pos) prop object)))
return pos))))))))
-(slime-DEFUN-if-undefined next-char-property-change (position &optional limit)
+(slime-defun-if-undefined next-char-property-change (position &optional limit)
(let ((tmp (next-overlay-change position)))
(when tmp
(setq tmp (min tmp limit)))
(next-property-change position nil tmp)))
-(slime-DEFUN-if-undefined previous-char-property-change
+(slime-defun-if-undefined previous-char-property-change
(position &optional limit)
(let ((tmp (previous-overlay-change position)))
(when tmp
(setq tmp (max tmp limit)))
(previous-property-change position nil tmp)))
-(slime-DEFUN-if-undefined substring-no-properties (string &optional start end)
+(slime-defun-if-undefined substring-no-properties (string &optional start end)
(let* ((start (or start 0))
(end (or end (length string)))
(string (substring string start end)))
(set-text-properties 0 (- end start) nil string)
string))
-(slime-DEFUN-if-undefined match-string-no-properties (num &optional string)
+(slime-defun-if-undefined match-string-no-properties (num &optional string)
(if (match-beginning num)
(if string
(substring-no-properties string (match-beginning num)
@@ -8973,7 +8972,7 @@
(buffer-substring-no-properties (match-beginning num)
(match-end num)))))
-(slime-DEFUN-if-undefined set-window-text-height (window height)
+(slime-defun-if-undefined set-window-text-height (window height)
(let ((delta (- height (window-text-height window))))
(unless (zerop delta)
(let ((window-min-height 1))
@@ -8983,10 +8982,10 @@
(enlarge-window delta))
(enlarge-window delta))))))
-(slime-DEFUN-if-undefined window-text-height (&optional window)
+(slime-defun-if-undefined window-text-height (&optional window)
(1- (window-height window)))
-(slime-DEFUN-if-undefined subst-char-in-string (fromchar tochar string
+(slime-defun-if-undefined subst-char-in-string (fromchar tochar string
&optional inplace)
"Replace FROMCHAR with TOCHAR in STRING each time it occurs.
Unless optional argument INPLACE is non-nil, return a new string."
@@ -8998,7 +8997,7 @@
(aset newstr i tochar)))
newstr))
-(slime-DEFUN-if-undefined count-screen-lines
+(slime-defun-if-undefined count-screen-lines
(&optional beg end count-final-newline window)
(unless beg
(setq beg (point-min)))
@@ -9018,19 +9017,19 @@
;; XXX make this xemacs compatible
(1+ (vertical-motion (buffer-size) window))))))
-(slime-DEFUN-if-undefined seconds-to-time (seconds)
+(slime-defun-if-undefined seconds-to-time (seconds)
"Convert SECONDS (a floating point number) to a time value."
(list (floor seconds 65536)
(floor (mod seconds 65536))
(floor (* (- seconds (ffloor seconds)) 1000000))))
-(slime-DEFUN-if-undefined time-less-p (t1 t2)
+(slime-defun-if-undefined time-less-p (t1 t2)
"Say whether time value T1 is less than time value T2."
(or (< (car t1) (car t2))
(and (= (car t1) (car t2))
(< (nth 1 t1) (nth 1 t2)))))
-(slime-DEFUN-if-undefined time-add (t1 t2)
+(slime-defun-if-undefined time-add (t1 t2)
"Add two time values. One should represent a time difference."
(let ((high (car t1))
(low (if (consp (cdr t1)) (nth 1 t1) (cdr t1)))
@@ -9057,17 +9056,17 @@
(list high low micro)))
-(slime-DEFUN-if-undefined line-beginning-position (&optional n)
+(slime-defun-if-undefined line-beginning-position (&optional n)
(save-excursion
(beginning-of-line n)
(point)))
-(slime-DEFUN-if-undefined line-end-position (&optional n)
+(slime-defun-if-undefined line-end-position (&optional n)
(save-excursion
(end-of-line n)
(point)))
-(slime-DEFUN-if-undefined check-parens ()
+(slime-defun-if-undefined check-parens ()
"Verify that parentheses in the current buffer are balanced.
If they are not, position point at the first syntax error found."
(interactive)
@@ -9100,7 +9099,7 @@
(error "After quote"))
(t (error "Shouldn't happen: parsing state: %S" state))))))
-(slime-DEFUN-if-undefined read-directory-name (prompt
+(slime-defun-if-undefined read-directory-name (prompt
&optional dir default-dirname
mustmatch initial)
(unless dir
@@ -9115,18 +9114,18 @@
(t
(error "Not a directory: %s" file)))))
-(slime-DEFUN-if-undefined check-coding-system (coding-system)
+(slime-defun-if-undefined check-coding-system (coding-system)
(or (eq coding-system 'binary)
(error "No such coding system: %S" coding-system)))
-(slime-DEFUN-if-undefined process-coding-system (process)
+(slime-defun-if-undefined process-coding-system (process)
'(binary . binary))
-(slime-DEFUN-if-undefined set-process-coding-system
+(slime-defun-if-undefined set-process-coding-system
(process &optional decoding encoding))
;; For Emacs 21
-(slime-DEFUN-if-undefined display-warning
+(slime-defun-if-undefined display-warning
(type message &optional level buffer-name)
(with-output-to-temp-buffer "*Warnings*"
(princ (format "Warning (%s %s): %s" type level message))))
@@ -9143,7 +9142,7 @@
(or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
"The directory for writing temporary files."))
-(slime-DEFMACRO-if-undefined with-temp-message (message &rest body)
+(slime-defmacro-if-undefined with-temp-message (message &rest body)
(let ((current-message (make-symbol "current-message"))
(temp-message (make-symbol "with-temp-message")))
`(let ((,temp-message ,message)
@@ -9157,7 +9156,7 @@
(and ,temp-message ,current-message
(message "%s" ,current-message))))))
-(slime-DEFMACRO-if-undefined with-selected-window (window &rest body)
+(slime-defmacro-if-undefined with-selected-window (window &rest body)
`(save-selected-window
(select-window ,window)
, at body))
More information about the slime-cvs
mailing list