Rename describe-project to describe-gnu-project.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fc30bce6c47fa5e3f0566c0005ef6bcb627e133..8eea2ef5bde376973cef756a4da58f128eee05b3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2008-02-29  Kim F. Storm  <storm@cua.dk>
 
+       * emulation/cua-base.el (cua-remap-control-v)
+       (cua-remap-control-z): New defcustoms.
+       (cua-mode): Add them to set-after property.
+       (cua--init-keymaps): Use them.
+       Add C-x/C-c home, end, next, and prior to cua--prefix-repeat-keymap.
+
        * help.el (view-emacs-todo): Rename from view-todo.
        (describe-gnu-project): Rename from describe-project.  Users changed.
        (view-help-file): New helper function.

diff --git a/lisp/startup.el b/lisp/startup.el
index 3e54e6f4e002b8e0f398a1d782726a65b1900afa..8ab56eee180092325488e8407ad74cf018d53ece 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1177,7 +1177,7 @@ If this is nil, no message will be displayed."
           '("GNU/Linux"
             (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html"))
             "Browse http://www.gnu.org/gnu/linux-and-gnu.html")
-        '("GNU" (lambda (button) (describe-project))
+        '("GNU" (lambda (button) (describe-gnu-project))
           "Display info on the GNU project")))
      " operating system.\n"
      :face variable-pitch "To quit a partially entered command, type "
@@ -1236,7 +1236,7 @@ Each element in the list should be a list of strings or pairs
           '("GNU/Linux"
             (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html"))
             "Browse http://www.gnu.org/gnu/linux-and-gnu.html")
-        '("GNU" (lambda (button) (describe-project))
+        '("GNU" (lambda (button) (describe-gnu-project))
           "Display info on the GNU project.")))
      " operating system.\n"
      :face (lambda ()
@@ -1262,7 +1262,7 @@ Each element in the list should be a list of strings or pairs
              (goto-char (point-min))))
      "\tHow to contribute improvements to Emacs\n"
      "\n"
-     :link ("GNU and Freedom" (lambda (button) (describe-project)))
+     :link ("GNU and Freedom" (lambda (button) (describe-gnu-project)))
      "\tWhy we developed GNU Emacs, and the GNU operating system\n"
      :link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
      "\tGNU Emacs comes with "
@@ -1872,7 +1872,7 @@ Type \\[describe-distribution] for information on "))
   (insert "\tHow to contribute improvements to Emacs\n\n")
 
   (insert-button "GNU and Freedom"
-                'action (lambda (button) (describe-project))
+                'action (lambda (button) (describe-gnu-project))
                 'follow-link t)
   (insert "\t\tWhy we developed GNU Emacs and the GNU system\n")