Merge commit '67ab56a5469f16652e73667ec3b4f76ff6befee6' from company

[gnu-emacs-elpa] / packages / windresize / windresize.el

diff --git a/packages/windresize/windresize.el b/packages/windresize/windresize.el
index 0d554a57c1c517bd442123cdf04cf95e2f488fb6..d80afdef751aedfc0b70b0ada9da9dd0e04031f7 100755 (executable)
--- a/packages/windresize/windresize.el
+++ b/packages/windresize/windresize.el
@@ -1,12 +1,13 @@
-;;; windresize.el --- resize windows interactively
+;;; windresize.el --- Resize windows interactively
 ;;
-;; Copyright (C) 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2014  Free Software Foundation, Inc.
 ;;
 ;; Filename: windresize.el
 ;; Author: Bastien <bzg AT altern DOT org>
 ;; Maintainer: Bastien <bzg AT altern DOT org>
 ;; Keywords: window
 ;; Description: Set window configuration with keystrokes
+;; Version: 0.1
 ;;
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -23,12 +24,19 @@
 ;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ;;
 ;; This is not part of GNU Emacs.
-;;
+
 ;;; Commentary:
+
+;; This mode lets you edit the window configuration interactively just
+;; by using the keyboard.
 ;;
-;; This mode let's you edit the window configuration interactively just
-;; by using the keyboard.  Quickstart: M-x windresize
+;; To use it, type M-x windresize; this puts Emacs in a state
+;; where the up/down and left/right arrow keys resize the window
+;; dimensions.  To return Emacs to its ordinary state, type RET.
 ;;
+;; See the docstring of `windresize' for a detailed description of the
+;; other commands that are available while windresize is active.
+
 ;;; History:
 ;;
 ;; This was largely inspired by Hirose Yuuji and Bob Wiener original
@@ -860,7 +868,7 @@ horizontally and vertically."
 (defun windresize-cancel-and-quit ()
   "Cancel window resizing and quit `windresize'."
   (interactive)
-  (if (eq major-mode 'help-mode)
+  (if (derived-mode-p 'help-mode)
       (progn (View-quit)
             (setq windresize-msg '("Help quit" . 2)))
     (switch-to-buffer windresize-buffer)