Convert consecutive FSF copyright years to ranges.

[bpt/emacs.git] / lisp / misc.el

diff --git a/lisp/misc.el b/lisp/misc.el
index 2ca39f7..8a571f4 100644 (file)
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -1,16 +1,17 @@
 ;;; misc.el --- some nonstandard basic editing commands for Emacs
 
-;; Copyright (C) 1989 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 2001-2011  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; 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.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -47,17 +46,34 @@ 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)))
       (setq string (concat string
                           (buffer-substring
                            (point)
-                           (min (save-excursion (end-of-line) (point))
+                           (min (line-end-position)
                                 (+ 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 +88,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)))))
@@ -90,7 +106,29 @@ With argument, do this that many times."
   (interactive "p")
   (forward-to-word (- arg)))
 
+;;;###autoload
+(defun butterfly ()
+  "Use butterflies to flip the desired bit on the drive platter.
+Open hands and let the delicate wings flap once.  The disturbance
+ripples outward, changing the flow of the eddy currents in the
+upper atmosphere.  These cause momentary pockets of higher-pressure
+air to form, which act as lenses that deflect incoming cosmic rays,
+focusing them to strike the drive platter and flip the desired bit.
+You can type `M-x butterfly C-M-c' to run it.  This is a permuted
+variation of `C-x M-c M-butterfly' from url `http://xkcd.com/378/'."
+  (interactive)
+  (if (yes-or-no-p "Do you really want to unleash the powers of the butterfly? ")
+      (progn
+       (switch-to-buffer (get-buffer-create "*butterfly*"))
+       (erase-buffer)
+       (sit-for 0)
+       (animate-string "Amazing physics going on..."
+                       (/ (window-height) 2) (- (/ (window-width) 2) 12))
+       (sit-for (* 5 (/ (abs (random)) (float most-positive-fixnum))))
+       (message "Successfully flipped one bit!"))
+    (message "Well, then go to xkcd.com!")
+    (browse-url "http://xkcd.com/378/")))
+
 (provide 'misc)
 
-;;; arch-tag: 908f7884-c19e-4388-920c-9cfa425e449b
 ;;; misc.el ends here