From 79cf212310d3b1dc039f2f752fd91d54cd03670c Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Sat, 10 Sep 2005 23:00:15 +0000 Subject: Fix bootstrap error. * lisp/cus-start.el: Remove bogus window-system reference from GTK test. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-406 --- lisp/cus-start.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lisp/cus-start.el') diff --git a/lisp/cus-start.el b/lisp/cus-start.el index d8ca2a77b58..96a8c5a8b27 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -366,10 +366,7 @@ since it could result in memory overflow and make Emacs crash." ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) ((string-match "\\`x-.*gtk" (symbol-name symbol)) - (or (boundp 'gtk) - (and window-system - (not (eq window-system 'pc)) - (not (eq system-type 'windows-nt))))) + (featurep 'gtk)) ((string-match "\\`x-" (symbol-name symbol)) (fboundp 'x-create-frame)) ((string-match "selection" (symbol-name symbol)) -- cgit v1.2.3 From b2a300dc19a9449c4b8b0138937193ac36b39b1c Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Thu, 29 Dec 2005 01:18:49 +0000 Subject: Fix error during bootstrap. * lisp/cus-start.el: Fix compilation error. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-464 --- lisp/cus-start.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/cus-start.el') diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 65f9c0812fd..991ff24058a 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -394,7 +394,7 @@ since it could result in memory overflow and make Emacs crash." ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) ((string-match "\\`mac-" (symbol-name symbol)) - (eq window-system 'mac)) + (or (eq system-type 'mac) (eq system-type 'darwin))) ((string-match "\\`x-.*gtk" (symbol-name symbol)) (featurep 'gtk)) ((string-match "\\`x-" (symbol-name symbol)) -- cgit v1.2.3 From c8f1ea764e39183369781f158db8df137f807833 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 7 Sep 2007 03:32:35 +0000 Subject: (split-window-preferred-function): Add custom info. --- lisp/ChangeLog | 2 ++ lisp/cus-start.el | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'lisp/cus-start.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7bc61dd9575..99e7af00446 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2007-09-07 Stefan Monnier + * cus-start.el (split-window-preferred-function): Add custom info. + * calendar/holidays.el (holiday-list, calendar-check-holidays) (calendar-mark-holidays, calendar-list-holidays) (holiday-filter-visible-calendar): New names to clean up namespace. diff --git a/lisp/cus-start.el b/lisp/cus-start.el index e2cb65c82c4..dd4a67812ca 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -342,6 +342,15 @@ since it could result in memory overflow and make Emacs crash." (even-window-heights windows boolean) (next-screen-context-lines windows integer) (split-height-threshold windows integer) + (split-window-preferred-function + windows + (choice (const :tag "vertically" split-window) + ;; FIXME: Add `sensibly' which chooses between + ;; vertical or horizontal splits depending on the size + ;; and shape of the window. + (const :tag "horizontally" + (lambda (window) + (split-window window nil 'horiz))))) (window-min-height windows integer) (window-min-width windows integer) (scroll-preserve-screen-position @@ -464,5 +473,5 @@ since it could result in memory overflow and make Emacs crash." (unless purify-flag (provide 'cus-start)) -;;; arch-tag: 4502730d-bcb3-4f5e-99a3-a86f2d54af60 +;; arch-tag: 4502730d-bcb3-4f5e-99a3-a86f2d54af60 ;;; cus-start.el ends here -- cgit v1.2.3 From e80134cd12c3b3cd55d213edb317bc026c9d2045 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 8 Sep 2007 10:35:27 +0000 Subject: (all): Add prefer-window-split-horizontally from window.c. --- lisp/ChangeLog | 5 +++++ lisp/cus-start.el | 2 ++ 2 files changed, 7 insertions(+) (limited to 'lisp/cus-start.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a77a51a2839..ed0431bd296 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-09-08 Fredrik Axelsson + + * cus-start.el (all): Add prefer-window-split-horizontally from + window.c. + 2007-09-08 Eli Zaretskii * net/browse-url.el (browse-url-galeon): Fix last change. diff --git a/lisp/cus-start.el b/lisp/cus-start.el index dd4a67812ca..d922329c62d 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -359,6 +359,8 @@ since it could result in memory overflow and make Emacs crash." (const :tag "Full screen (t)" :value t) (other :tag "Always" 1))) (display-buffer-reuse-frames windows boolean "21.1") + (prefer-window-split-horizontally + windows (choice boolean integer) "22.1") ;; xdisp.c (scroll-step windows integer) (scroll-conservatively windows integer) -- cgit v1.2.3 From 1c5eb1357a2b89a98a47cf4bd8ee954a3cc5643d Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Wed, 12 Sep 2007 11:32:41 +0000 Subject: (all): Revert 2007-09-08 change. --- lisp/ChangeLog | 4 ++++ lisp/cus-start.el | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lisp/cus-start.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 996b70a4c34..f1cfd7a03ea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-09-12 Romain Francoise + + * cus-start.el (all): Revert 2007-09-08 change. + 2007-09-12 Aaron Hawley * jka-cmpr-hook.el (jka-compr-compression-info-list): Use gzip to diff --git a/lisp/cus-start.el b/lisp/cus-start.el index d922329c62d..dd4a67812ca 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -359,8 +359,6 @@ since it could result in memory overflow and make Emacs crash." (const :tag "Full screen (t)" :value t) (other :tag "Always" 1))) (display-buffer-reuse-frames windows boolean "21.1") - (prefer-window-split-horizontally - windows (choice boolean integer) "22.1") ;; xdisp.c (scroll-step windows integer) (scroll-conservatively windows integer) -- cgit v1.2.3 From f4c307a53b1e7fd20f5b93c4f6fe271e4ae770c9 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 6 Oct 2007 10:06:28 +0000 Subject: (all): Add focus-follows-mouse. --- lisp/cus-start.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/cus-start.el') diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 27d72d4e049..1e2dd6c57af 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -167,6 +167,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ;; fns.c (use-dialog-box menu boolean "21.1") (use-file-dialog menu boolean "22.1") + (focus-follows-mouse frames boolean "20.3") ;; frame.c (default-frame-alist frames (repeat (cons :format "%v" -- cgit v1.2.3