diff options
| author | Joakim Verona | 2013-09-12 07:46:45 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-12 07:46:45 +0200 |
| commit | 7701e0724215b82d2f635c19d7e7f2a9863e687c (patch) | |
| tree | b759e59df3edf3f5d661db8d24296cd3da116160 /lisp/dframe.el | |
| parent | dd30d6b73383df67468e4705492206bae6a8185c (diff) | |
| parent | 96b3f75a809761389cbbdc2eb0ed85f4559a8eef (diff) | |
| download | emacs-7701e0724215b82d2f635c19d7e7f2a9863e687c.tar.gz emacs-7701e0724215b82d2f635c19d7e7f2a9863e687c.zip | |
merge from trunk
Diffstat (limited to 'lisp/dframe.el')
| -rw-r--r-- | lisp/dframe.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/dframe.el b/lisp/dframe.el index 66967075e34..3ef30d055b6 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el | |||
| @@ -758,9 +758,8 @@ who requested the timer. NULL-ON-ERROR is ignored." | |||
| 758 | Evaluates all cached timer functions in sequence." | 758 | Evaluates all cached timer functions in sequence." |
| 759 | (let ((l dframe-client-functions)) | 759 | (let ((l dframe-client-functions)) |
| 760 | (while (and l (sit-for 0)) | 760 | (while (and l (sit-for 0)) |
| 761 | (condition-case er | 761 | (with-demoted-errors "DFRAME TIMER ERROR: %S" |
| 762 | (funcall (car l)) | 762 | (funcall (car l))) |
| 763 | (error (message "DFRAME TIMER ERROR: %S" er))) | ||
| 764 | (setq l (cdr l))))) | 763 | (setq l (cdr l))))) |
| 765 | 764 | ||
| 766 | ;;; Menu hacking for mouse-3 | 765 | ;;; Menu hacking for mouse-3 |