Mercurial > emacs

changeset 53406:45cc6f8abd8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(pop-up-frame-function): Use quote, not `function'. (frame-notice-user-settings): Calculate ADJUSTED-TOP copying with lists as coordinate values.
author Richard M. Stallman <rms@gnu.org>
date Mon, 29 Dec 2003 19:17:24 +0000
parents decc60fe49d5
children 0e54e5e10501
files lisp/frame.el
diffstat 1 files changed, 19 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/frame.el	Mon Dec 29 19:16:05 2003 +0000
+++ b/lisp/frame.el	Mon Dec 29 19:17:24 2003 +0000
@@ -85,8 +85,9 @@
   :group 'frames)
 
 (setq pop-up-frame-function
-      (function (lambda ()
-		  (make-frame pop-up-frame-alist))))
+      ;; Using `function' here caused some sort of problem.
+      '(lambda ()
+	 (make-frame pop-up-frame-alist)))
 
 (defcustom special-display-frame-alist
   '((height . 14) (width . 80) (unsplittable . t))
@@ -335,10 +336,22 @@
 					   frame-initial-geometry-arguments)))
 		   (top (frame-parameter frame-initial-frame 'top)))
 	      (when (and (consp initial-top) (eq '- (car initial-top)))
-		(setq newparms
-		      (append newparms
-			      `((top . ,(+ top (* lines char-height))))
-			      nil)))
+		(let ((adjusted-top
+		       (cond ((and (consp top)
+				   (eq '+ (car top)))
+			      (list '+
+				    (+ (cadr top)
+				       (* lines char-height))))
+			     ((and (consp top)
+				   (eq '- (car top)))
+			      (list '-
+				    (- (cadr top)
+				       (* lines char-height))))
+			     (t (+ top (* lines char-height))))))
+		  (setq newparms
+			(append newparms
+				`((top . ,adjusted-top))
+				nil))))
 	      (modify-frame-parameters frame-initial-frame newparms)
 	      (tool-bar-mode -1)))))