diff options
| author | Jay Belanger | 2008-05-19 02:42:28 +0000 |
|---|---|---|
| committer | Jay Belanger | 2008-05-19 02:42:28 +0000 |
| commit | 2e4daa0e05fd40231760e7a820a140ee77868b21 (patch) | |
| tree | d79e7f2b0e1e7d356b38289a0a44604fefc59c92 | |
| parent | b78a11dc14001e2121a9f03a899bae02f4054196 (diff) | |
| download | emacs-2e4daa0e05fd40231760e7a820a140ee77868b21.tar.gz emacs-2e4daa0e05fd40231760e7a820a140ee77868b21.zip | |
(calc-get-register): Fix problem when the Calc register is empty.
| -rw-r--r-- | lisp/calc/calc-yank.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el index e1e83abe70c..65bec46db8e 100644 --- a/lisp/calc/calc-yank.el +++ b/lisp/calc/calc-yank.el | |||
| @@ -156,9 +156,9 @@ in which case either return the contents of the Emacs register (if it is | |||
| 156 | text) or `nil'." | 156 | text) or `nil'." |
| 157 | (let ((cval (cdr (assq reg calc-register-alist))) | 157 | (let ((cval (cdr (assq reg calc-register-alist))) |
| 158 | (val (cdr (assq reg register-alist)))) | 158 | (val (cdr (assq reg register-alist)))) |
| 159 | (if (and (stringp (car cval)) | 159 | (if (stringp val) |
| 160 | (stringp val)) | 160 | (if (and (stringp (car cval)) |
| 161 | (if (string= (car cval) val) | 161 | (string= (car cval) val)) |
| 162 | (cdr cval) | 162 | (cdr cval) |
| 163 | val)))) | 163 | val)))) |
| 164 | 164 | ||