aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dframe.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6068454f781..6f1979a5b54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-04-12 Juanma Barranquero <lekktu@gmail.com>
2
3 * dframe.el (dframe-current-frame): Remove spurious quote.
4
12011-04-12 Glenn Morris <rgm@gnu.org> 52011-04-12 Glenn Morris <rgm@gnu.org>
2 6
3 * calendar/cal-tex.el (cal-tex-end-document): 7 * calendar/cal-tex.el (cal-tex-end-document):
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 312f49f6053..71773b1abf8 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -632,7 +632,7 @@ selecting FRAME-VAR."
632FRAME-VAR is the variable storing the currently active dedicated frame. 632FRAME-VAR is the variable storing the currently active dedicated frame.
633If the current frame's buffer uses DESIRED-MAJOR-MODE, then use that frame." 633If the current frame's buffer uses DESIRED-MAJOR-MODE, then use that frame."
634 (if (not (eq (selected-frame) (symbol-value frame-var))) 634 (if (not (eq (selected-frame) (symbol-value frame-var)))
635 (if (and (eq major-mode 'desired-major-mode) 635 (if (and (eq major-mode desired-major-mode)
636 (get-buffer-window (current-buffer)) 636 (get-buffer-window (current-buffer))
637 (window-frame (get-buffer-window (current-buffer)))) 637 (window-frame (get-buffer-window (current-buffer))))
638 (window-frame (get-buffer-window (current-buffer))) 638 (window-frame (get-buffer-window (current-buffer)))