(pop-up-frame-function): Remove choice nil since it

[gnu-emacs] / lisp / bindings.el

diff --git a/lisp/bindings.el b/lisp/bindings.el
index cab319e1a3c1561277c9756ea7f8d132b137040c..88073a85da1a946b69f407f06b11b8e0aaeb4bec 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1,7 +1,7 @@
 ;;; bindings.el --- define standard key bindings and some variables
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -146,7 +146,7 @@ corresponding to the mode line clicked."
 (defun mode-line-eol-desc ()
   (let* ((eol (coding-system-eol-type buffer-file-coding-system))
         (mnemonic (coding-system-eol-type-mnemonic buffer-file-coding-system))
-        (desc (assq eol mode-line-eol-desc-cache)))
+        (desc (assoc eol mode-line-eol-desc-cache)))
     (if (and desc (eq (cadr desc) mnemonic))
        (cddr desc)
       (if desc (setq mode-line-eol-desc-cache nil)) ;Flush the cache if stale.
@@ -155,7 +155,7 @@ corresponding to the mode line clicked."
             mnemonic
             'help-echo (format "End-of-line style: %s\nmouse-1 to cycle"
                                (if (eq eol 0) "Unix-style LF"
-                                 (if (eq eol 1) "Dos-style CRLF"
+                                 (if (eq eol 1) "DOS-style CRLF"
                                    (if (eq eol 2) "Mac-style CR"
                                      "Undecided"))))
             'keymap
@@ -170,8 +170,8 @@ corresponding to the mode line clicked."
 (defvar mode-line-client
   `(""
     (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" "")))
-                help-echo "Emacsclient frame"))
-  "Mode-line control for identifying Emacsclient frames.")
+                help-echo "emacsclient frame"))
+  "Mode-line control for identifying emacsclient frames.")
 
 (defvar mode-line-mule-info
   `(""
@@ -219,16 +219,15 @@ mnemonics of the following coding systems:
 (defun mode-line-frame-control ()
   "Compute mode-line control for frame identification.
 Value is used for `mode-line-frame-identification', which see."
-  (if (or (null initial-window-system)
-         (eq initial-window-system 'pc))
+  (if (or (null window-system)
+         (eq window-system 'pc))
       "-%F  "
     "  "))
 
-(defvar mode-line-frame-identification "  "
-  "Mode-line control to describe the current frame.")
 ;; We need to defer the call to mode-line-frame-control to the time
 ;; the mode line is actually displayed.
-(setq mode-line-frame-identification '(:eval (mode-line-frame-control)))
+(defvar mode-line-frame-identification '(:eval (mode-line-frame-control))
+  "Mode-line control to describe the current frame.")
 (put 'mode-line-frame-identification 'risky-local-variable t)
 
 (defvar mode-line-process nil "\
@@ -601,6 +600,8 @@ is okay.  See `mode-line-format'.")
                ".a" ".ln" ".blg" ".bbl")))
        '(".elc" ".lof"
         ".glo" ".idx" ".lot"
+        ;; VCS metadata directories
+        ".svn/" ".hg/" ".git/" ".bzr/" "CVS/" "_darcs/" "_MTN/"
         ;; TeX-related
         ".fmt" ".tfm"
         ;; Java compiled
@@ -1055,8 +1056,8 @@ language you are using."
 (global-set-key [C-right]  'forward-word)
 (global-set-key [C-left]   'backward-word)
 ;; This is not quite compatible, but at least is analogous
-(global-set-key [C-delete] 'backward-kill-word)
-(global-set-key [C-backspace] 'kill-word)
+(global-set-key [C-delete] 'kill-word)
+(global-set-key [C-backspace] 'backward-kill-word)
 ;; This is "move to the clipboard", or as close as we come.
 (global-set-key [S-delete] 'kill-region)