Update GPL version for Emacs images.

[gnu-emacs] / lisp / misc.el

diff --git a/lisp/misc.el b/lisp/misc.el
index 2ca39f7b1e5a6e864df6fdc0115e8b4c7ba64ccc..d3c1a46dfdf125ee185f19d013521d39e618b7de 100644 (file)
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -1,6 +1,7 @@
 ;;; misc.el --- some nonstandard basic editing commands for Emacs
 
-;; Copyright (C) 1989 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience
@@ -9,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,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:
 
@@ -47,7 +48,7 @@ The characters copied are inserted in the buffer before point."
       (if (< cc (current-column))
          (if (= (preceding-char) ?\t)
              (progn
-               (setq string (make-string (min n (- (current-column) cc)) ?\ ))
+               (setq string (make-string (min n (- (current-column) cc)) ?\s))
                (setq n (- n (min n (- (current-column) cc)))))
            ;; In middle of ctl char => copy that whole char.
            (backward-char 1)))
@@ -58,6 +59,23 @@ The characters copied are inserted in the buffer before point."
                                 (+ n (point)))))))
     (insert string)))
 
+;; Variation of `zap-to-char'.
+
+(defun zap-up-to-char (arg char)
+  "Kill up to, but not including ARGth occurrence of CHAR.
+Case is ignored if `case-fold-search' is non-nil in the current buffer.
+Goes backward if ARG is negative; error if CHAR not found.
+Ignores CHAR at point."
+  (interactive "p\ncZap up to char: ")
+  (let ((direction (if (>= arg 0) 1 -1)))
+    (kill-region (point)
+                (progn
+                  (forward-char direction)
+                  (unwind-protect
+                      (search-forward (char-to-string char) nil nil arg)
+                    (backward-char direction))
+                  (point)))))
+
 ;; These were added with an eye to making possible a more CCA-compatible
 ;; command set; but that turned out not to be interesting.
 
@@ -72,7 +90,7 @@ The characters copied are inserted in the buffer before point."
   (push-mark (point-max)))
 
 (defun upcase-char (arg)
-  "Uppercasify ARG chars starting from point.  Point doesn't move"
+  "Uppercasify ARG chars starting from point.  Point doesn't move."
   (interactive "p")
   (save-excursion
     (upcase-region (point) (progn (forward-char arg) (point)))))