(custom-initialize-safe-set, custom-initialize-safe-default): Doc fixes.

[gnu-emacs] / lisp / electric.el

diff --git a/lisp/electric.el b/lisp/electric.el
index 3d2bf140c8c9543539e3431d99a693b3045add22..32fb843e2cb705a2dfd3d7f6ea70b1e538deabf7 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -144,31 +144,17 @@
         (buf (get-buffer buffer))
         (one-window (one-window-p t))
         (pop-up-windows t)
-        (pop-up-frames nil)
-        (target-height)
-        (lines))
+        (pop-up-frames nil))
     (if (not buf)
        (error "Buffer %s does not exist" buffer)
-      (with-current-buffer buf
-       (setq lines (count-lines (point-min) (point-max)))
-       (setq target-height
-             (min (max (if max-height (min max-height (1+ lines)) (1+ lines))
-                       window-min-height)
-                  (save-window-excursion
-                    (delete-other-windows)
-                    (1- (window-height (selected-window)))))))
       (cond ((and (eq (window-buffer win) buf))
             (select-window win))
            (one-window
             (pop-to-buffer buffer)
-            (setq win (selected-window))
-            (enlarge-window (- target-height (window-height win))))
+            (setq win (selected-window)))
            (t
             (switch-to-buffer buf)))
-      (if (and (not max-height)
-              (> target-height (window-height (selected-window))))
-         (progn (goto-char (window-start win))
-                (enlarge-window (- target-height (window-height win)))))
+      (fit-window-to-buffer win max-height)
       (goto-char (point-min))
       win)))