Fix restoring in GUI sessions desktop saved in TTY sessions

* lisp/frameset.el (frameset-filter-font-param): New function.
(frameset-persistent-filter-alist): Use it for processing the
'font' frame parameter.  (Bug#17352)

diff --git a/lisp/frameset.el b/lisp/frameset.el
index 661f0aee27350647452ba2a756c810a0cbf23db7..593451a4d75dadf7b3ce0bccc50d7df34de2700f 100644 (file)
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -447,7 +447,7 @@ DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
      (buffer-predicate   . :never)
      (buried-buffer-list . :never)
      (delete-before      . :never)
-     (font               . frameset-filter-shelve-param)
+     (font               . frameset-filter-font-param)
      (foreground-color   . frameset-filter-sanitize-color)
      (fullscreen         . frameset-filter-shelve-param)
      (GUI:font           . frameset-filter-unshelve-param)
@@ -631,6 +631,17 @@ see `frameset-filter-alist'."
          (setcdr found val)
          nil))))
 
+(defun frameset-filter-font-param (current filtered parameters saving
+                                           &optional prefix)
+  "When switching from a tty frame to a GUI frame, remove the FONT param.
+
+When switching from a GUI frame to a tty frame, behave
+as `frameset-filter-shelve-param' does."
+  (or saving
+      (if (frameset-switch-to-gui-p parameters)
+          (frameset-filter-shelve-param current filtered parameters saving
+                                        prefix))))
+
 (defun frameset-filter-iconified (_current _filtered parameters saving)
   "Remove CURRENT when saving an iconified frame.
 This is used for positional parameters `left' and `top', which are