auto upstream

6 files changed, 65 insertions, 8 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 77e7e47b8a3..4199bd302a9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -35,6 +35,9 @@ simply disabling Transient Mark mode does the same thing.
 
 * Editing Changes in Emacs 24.4
 
+** New commands `toggle-frame-maximized' and `cycle-frame-maximized',
+bound to <f11> and S-<f11>, respectively.
+
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49e129cd77a..adf8d9f88f0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2012-12-12  Sam Steingold  <sds@gnu.org>
+
+        * frame.el (frame-maximization-style): New user option.
+        (toggle-frame-maximized): Toggle frame maximization according to
+        `frame-maximization-style', bound to <f11>.
+        (cycle-frame-maximized): Cycle between all maximization styles and
+        non-maximized frame, bound to shift-<f11>.
+
+2012-12-12  David Cadé  <codename68@gmail.com>
+
+        * mpc.el (mpc-format): Use truncate-string-to-width (bug#13143).
+
 2012-12-12  Jonas Bernoulli  <jonas@bernoul.li>
 
         * lisp/emacs-lisp/eieio.el: Prettier object pretty-printing (bug#13115).
diff --git a/lisp/frame.el b/lisp/frame.el
index 7a54efc23e7..559aa35242d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1654,12 +1654,42 @@ terminals, cursor blinking is controlled by the terminal."
                                'blink-cursor-start))))
 
 
+;; Frame maximization
+(defcustom frame-maximization-style 'maximized
+  "The maximization style of \\[toggle-frame-maximized]."
+  :version "24.4"
+  :type '(choice
+          (const :tab "Respect window manager screen decorations." maximized)
+          (const :tab "Ignore window manager screen decorations." fullscreen))
+  :group 'frames)
+
+(defun toggle-frame-maximized ()
+  "Maximize/un-maximize Emacs frame according to `frame-maximization-style'.
+See also `cycle-frame-maximized'."
+  (interactive)
+  (modify-frame-parameters
+   nil `((fullscreen . ,(if (frame-parameter nil 'fullscreen)
+                            nil frame-maximization-style)))))
+
+(defun cycle-frame-maximized ()
+  "Cycle Emacs frame between normal, maximized, and fullscreen.
+See also `toggle-frame-maximized'."
+  (interactive)
+  (modify-frame-parameters
+   nil `((fullscreen . ,(cl-case (frame-parameter nil 'fullscreen)
+                                 ((nil) 'maximized)
+                                 ((maximized) 'fullscreen)
+                                 ((fullscreen) nil))))))
+
+
 ;;;; Key bindings
 
 (define-key ctl-x-5-map "2" 'make-frame-command)
 (define-key ctl-x-5-map "1" 'delete-other-frames)
 (define-key ctl-x-5-map "0" 'delete-frame)
 (define-key ctl-x-5-map "o" 'other-frame)
+(define-key global-map [f11] 'toggle-frame-maximized)
+(define-key global-map [(shift f11)] 'cycle-frame-maximized)
 
 
 ;; Misc.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2d2d9318bd6..565096b6289 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-12  Sam Steingold  <sds@gnu.org>
+
+        * gnus.el (gnus-other-frame-resume-function): Add user option.
+        (gnus-other-frame): Call `gnus-other-frame-resume-function' on resume.
+
 2012-12-06  Sam Steingold  <sds@gnu.org>
 
         * gnus-start.el (gnus-before-resume-hook): Add.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 70e7f711f3d..753c5fb473e 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2495,7 +2495,15 @@ Disabling the agent may result in noticeable loss of performance."
   :type 'boolean)
 
 (defcustom gnus-other-frame-function 'gnus
-  "Function called by the command `gnus-other-frame'."
+  "Function called by the command `gnus-other-frame' when starting Gnus."
+  :group 'gnus-start
+  :type '(choice (function-item gnus)
+                 (function-item gnus-no-server)
+                 (function-item gnus-slave)
+                 (function-item gnus-slave-no-server)))
+
+(defcustom gnus-other-frame-resume-function 'gnus-group-get-new-news
+  "Function called by the command `gnus-other-frame' when resuming Gnus."
   :group 'gnus-start
   :type '(choice (function-item gnus)
                  (function-item gnus-no-server)
@@ -4361,8 +4369,9 @@ Used for `gnus-exit-gnus-hook' in `gnus-other-frame'."
   "Pop up a frame to read news.
 This will call one of the Gnus commands which is specified by the user
 option `gnus-other-frame-function' (default `gnus') with the argument
-ARG if Gnus is not running, otherwise just pop up a Gnus frame.  The
-optional second argument DISPLAY should be a standard display string
+ARG if Gnus is not running, otherwise pop up a Gnus frame and run the
+command specified by `gnus-other-frame-resume-function'.
+The optional second argument DISPLAY should be a standard display string
 such as \"unix:0\" to specify where to pop up a frame.  If DISPLAY is
 omitted or the function `make-frame-on-display' is not available, the
 current display is used."
@@ -4394,7 +4403,8 @@ current display is used."
                  (make-frame-on-display display gnus-other-frame-parameters)
                (make-frame gnus-other-frame-parameters))))
       (if alive
-          (switch-to-buffer gnus-group-buffer)
+          (progn (switch-to-buffer gnus-group-buffer)
+           (funcall gnus-other-frame-resume-function arg))
         (funcall gnus-other-frame-function arg)
         (add-hook 'gnus-exit-gnus-hook 'gnus-delete-gnus-frame)
   ;; One might argue that `gnus-delete-gnus-frame' should not be called
diff --git a/lisp/mpc.el b/lisp/mpc.el
index e8b5c50e561..65363de40f3 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1034,11 +1034,8 @@ If PLAYLIST is t or nil or missing, use the main playlist."
             (let ((display
                    (if (and size
                             (> (+ postwidth textwidth) size))
-                       ;; This doesn't even obey double-width chars :-(
                        (propertize
-                        (if (zerop (- size postwidth 1))
-                            (substring text 0 1)
-                          (concat (substring text 0 (- size postwidth textwidth 1)) "…"))
+                        (truncate-string-to-width text size nil nil "…")
                         'help-echo text)
                      text)))
               (when (memq tag '(Artist Album Composer)) ;FIXME: wrong list.