bug#13251: Fwd: bug#13251: Wishlist: Add ability to set initial buffer for new frames.

[Constantin Kulikov <zxnotdead@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 247 bytes --]

---------- Forwarded message ----------
From: Constantin Kulikov <zxnotdead@gmail.com>
Date: 2012/12/23
Subject: Re: bug#13251: Wishlist: Add ability to set initial buffer for new
frames.
To: martin rudalics <rudalics@gmx.at>


another attempt...

[-- Attachment #1.2: Type: text/html, Size: 504 bytes --]

[-- Attachment #2: initial-buffer-choice-as-function.patch --]
[-- Type: application/octet-stream, Size: 3633 bytes --]

=== modified file 'lisp/server.el'
--- lisp/server.el	2012-11-09 06:28:27 +0000
+++ lisp/server.el	2012-12-23 16:55:05 +0000
@@ -1256,12 +1256,21 @@
           (mapc 'funcall (nreverse commands))
 
 	  ;; If we were told only to open a new client, obey
-	  ;; `initial-buffer-choice' if it specifies a file.
-	  (unless (or files commands)
-	    (if (stringp initial-buffer-choice)
-		(find-file initial-buffer-choice)
-	      (switch-to-buffer (get-buffer-create "*scratch*")
-				'norecord)))
+	  ;; `initial-buffer-choice' if it specifies a file
+          ;; or a function.
+          (unless (or files commands)
+            (let ((buf
+                   (cond
+                    ((stringp initial-buffer-choice)
+                     (find-file-noselect initial-buffer-choice))
+                    ((functionp initial-buffer-choice)
+                     (funcall initial-buffer-choice)))))
+              (cond ((buffer-live-p buf)
+                     (switch-to-buffer buf 'norecord))
+                    ((and (eq nil buf) (eq nil inhibit-startup-screen))
+                     (display-startup-screen))
+                    (t (switch-to-buffer
+                        (get-buffer-create "*scratch*"))))))
 
           ;; Delete the client if necessary.
           (cond

=== modified file 'lisp/startup.el'
--- lisp/startup.el	2012-12-01 02:08:30 +0000
+++ lisp/startup.el	2012-12-23 15:16:26 +0000
@@ -41,9 +41,10 @@
 (defcustom initial-buffer-choice nil
   "Buffer to show after starting Emacs.
 If the value is nil and `inhibit-startup-screen' is nil, show the
-startup screen.  If the value is a string, visit the specified file
-or directory using `find-file'.  If t, open the `*scratch*'
-buffer.
+startup screen.  If the value is a string, switch to a buffer visiting
+the file or directory specified by that string. If the value is a
+function, switch to the buffer returned by that function. If t, open
+the `*scratch*' buffer.
 
 A string value also causes emacsclient to open the specified file
 or directory when no target file is specified."
@@ -51,8 +52,9 @@
 	  (const     :tag "Startup screen" nil)
 	  (directory :tag "Directory" :value "~/")
 	  (file      :tag "File" :value "~/.emacs")
+          (function  :tag "Function")
 	  (const     :tag "Lisp scratch buffer" t))
-  :version "23.1"
+  :version "24.4"
   :group 'initialization)
 
 (defcustom inhibit-startup-screen nil
@@ -2308,11 +2310,6 @@
 	    ;; abort later.
 	    (unless (frame-live-p (selected-frame)) (kill-emacs nil))))))
 
-    (when (eq initial-buffer-choice t)
-      ;; When initial-buffer-choice equals t make sure that *scratch*
-      ;; exists.
-      (get-buffer-create "*scratch*"))
-
     ;; If *scratch* exists and is empty, insert initial-scratch-message.
     ;; Do this before switching to *scratch* below to handle bug#9605.
     (and initial-scratch-message
@@ -2323,10 +2320,15 @@
 	     (set-buffer-modified-p nil))))
 
     (when initial-buffer-choice
-      (cond ((eq initial-buffer-choice t)
-	     (switch-to-buffer (get-buffer-create "*scratch*")))
-	    ((stringp initial-buffer-choice)
-	     (find-file initial-buffer-choice))))
+      (let ((buf
+             (cond
+              ((stringp initial-buffer-choice)
+               (find-file-noselect initial-buffer-choice))
+              ((functionp initial-buffer-choice)
+               (funcall initial-buffer-choice)))))
+        (if (buffer-live-p buf)
+            (switch-to-buffer buf 'norecord)
+          (switch-to-buffer (get-buffer-create "*scratch*") 'norecord))))
 
     (if (or inhibit-startup-screen
 	    initial-buffer-choice