From: Miles Bader <miles@gnu.org>
Date: Sat, 13 Oct 2007 05:53:03 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~313
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b42d458a45eaf9767da327f76a40a1cf9c77c23;p=emacs.git

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 880-885)

   - Remove RCS keywords from doc/misc/cc-mode.texi
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264
---

2b42d458a45eaf9767da327f76a40a1cf9c77c23
diff --cc lisp/ldefs-boot.el
index 7e2a32a42e5,4a443629d38..c7679a7e58a
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@@ -29117,13 -29247,13 +29117,13 @@@ If FILE-NAME is non-nil, save the resul
  
  ;;;***
  
- ;;;### (autoloads (vc-annotate vc-branch-part vc-trunk-p vc-update-change-log
- ;;;;;;  vc-rename-file vc-transfer-file vc-switch-backend vc-update
- ;;;;;;  vc-rollback vc-revert vc-print-log vc-retrieve-snapshot vc-create-snapshot
- ;;;;;;  vc-directory vc-merge vc-insert-headers vc-version-other-window
+ ;;;### (autoloads (vc-annotate vc-update-change-log vc-rename-file
+ ;;;;;;  vc-transfer-file vc-switch-backend vc-rollback vc-update
+ ;;;;;;  vc-revert vc-print-log vc-retrieve-snapshot vc-create-snapshot
+ ;;;;;;  vc-directory vc-merge vc-insert-headers vc-revision-other-window
  ;;;;;;  vc-diff vc-register vc-next-action vc-do-command edit-vc-file
 -;;;;;;  with-vc-file vc-branch-part vc-trunk-p vc-before-checkin-hook
 -;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (18104 24741))
 +;;;;;;  with-vc-file vc-before-checkin-hook vc-checkin-hook vc-checkout-hook)
 +;;;;;;  "vc" "vc.el" (18190 35214))
  ;;; Generated autoloads from vc.el
  
  (defvar vc-checkout-hook nil "\
diff --cc src/frame.c
index 8314ad7a398,927f448dd0b..5f4e12cd705
--- a/src/frame.c
+++ b/src/frame.c
@@@ -114,12 -110,8 +114,11 @@@ Lisp_Object Qbuffer_predicate, Qbuffer_
  Lisp_Object Qtty_color_mode;
  Lisp_Object Qtty, Qtty_type;
  Lisp_Object Qwindow_system;
- Lisp_Object Qenvironment;
  
  Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth;
 +#ifdef USE_FONT_BACKEND
 +Lisp_Object Qfont_backend;
 +#endif	/* USE_FONT_BACKEND */
  
  Lisp_Object Qinhibit_face_set_after_frame_default;
  Lisp_Object Qface_set_after_frame_default;