--- a/etc/sample.emacs	Mon Aug 13 08:48:43 2007 +0200
+++ b/etc/sample.emacs	Mon Aug 13 08:49:20 2007 +0200
@@ -38,34 +38,34 @@
 ;; and such.
 
 ;; Make F1 invoke help
-(global-set-key 'f1 'help-command)
+(global-set-key [f1] 'help-command)
 ;; Make F2 be `undo'
-(global-set-key 'f2 'undo)
+(global-set-key [f2] 'undo)
 ;; Make F3 be `find-file'
 ;; Note: it does not currently work to say
 ;;   (global-set-key 'f3 "\C-x\C-f")
 ;; The reason is that macros can't do interactive things properly.
 ;; This is an extremely longstanding bug in Emacs.  Eventually,
 ;; it will be fixed. (Hopefully ..)
-(global-set-key 'f3 'find-file)
+(global-set-key [f3] 'find-file)
 
 ;; Make F4 be "mark", F5 be "copy", F6 be "paste"
 ;; Note that you can set a key sequence either to a command or to another
 ;; key sequence.
-(global-set-key 'f4 'set-mark-command)
-(global-set-key 'f5 "\M-w")
-(global-set-key 'f6 "\C-y")
+(global-set-key [f4] 'set-mark-command)
+(global-set-key [f5] "\M-w")
+(global-set-key [f6] "\C-y")
 
 ;; Shift-F4 is "pop mark off of stack"
 (global-set-key '(shift f4) (lambda () (interactive) (set-mark-command t)))
 
 ;; Make F7 be `save-buffer'
-(global-set-key 'f7 'save-buffer)
+(global-set-key [f7] 'save-buffer)
 
 ;; Make F8 be "start macro", F9 be "end macro", F10 be "execute macro"
-(global-set-key 'f8 'start-kbd-macro)
-(global-set-key 'f9 'end-kbd-macro)
-(global-set-key 'f10 'call-last-kbd-macro)
+(global-set-key [f8] 'start-kbd-macro)
+(global-set-key [f9] 'end-kbd-macro)
+(global-set-key [f10] 'call-last-kbd-macro)
 
 ;; Here's an alternative binding if you don't use keyboard macros:
 ;; Make F8 be `save-buffer' followed by `delete-window'.
@@ -98,21 +98,6 @@
        ;; When running ispell, consider all 1-3 character words as correct.
        (setq ispell-extra-args '("-W" "3"))
 
-       ;; Change the way the buffer name is displayed in the
-       ;; modeline.  The variable for this is called
-       ;; 'modeline-buffer-identification but was called
-       ;; 'mode-line-buffer-identification in older XEmacsen.
-       (if (boundp 'modeline-buffer-identification)
-	   ;; Note that if you want to put more than one form in the
-	   ;; `THEN' clause of an IF-THEN-ELSE construct, you have to
-	   ;; surround the forms with `progn'.  You don't have to
-	   ;; do this for the `ELSE' clauses.
-	   (progn
-	     (setq-default modeline-buffer-identification '("XEmacs: %17b"))
-	     (setq         modeline-buffer-identification '("XEmacs: %17b")))
-	 (setq-default mode-line-buffer-identification '("XEmacs: %17b"))
-	 (setq         mode-line-buffer-identification '("XEmacs: %17b")))
-
        (cond ((or (not (fboundp 'device-type))
 		  (equal (device-type) 'x))
 	      ;; Code which applies only when running emacs under X goes here.