[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget c26306b 2/4: reverting some spurious changes
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget c26306b 2/4: reverting some spurious changes |
Date: |
Wed, 31 Dec 2014 18:06:03 +0000 |
branch: xwidget
commit c26306b0237235dd414f49d4693192827c07acdb
Author: jave <address@hidden>
Commit: jave <address@hidden>
reverting some spurious changes
---
lisp/progmodes/cc-mode.el | 12 +++---------
lisp/vc/vc-dir.el | 2 --
make-dist | 4 ++--
nt/INSTALL.OLD | 2 +-
src/.gdbinit | 24 ------------------------
5 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index a90dddd..a482447 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1201,9 +1201,6 @@ Note that the style variables are always made local to
the buffer."
;; `c-set-fl-decl-start' for the detailed functionality.
(cons (c-set-fl-decl-start beg) end))
-(defvar c-standard-font-lock-fontify-region-function nil
- "Standard value of `font-lock-fontify-region-function'")
-
(defun c-font-lock-fontify-region (beg end &optional verbose)
;; Effectively advice around `font-lock-fontify-region' which extends the
;; region (BEG END), for example, to avoid context fontification chopping
@@ -1229,17 +1226,14 @@ Note that the style variables are always made local to
the buffer."
(setq new-region (funcall fn new-beg new-end))
(setq new-beg (car new-region) new-end (cdr new-region)))
c-before-context-fontification-functions))))
- (funcall c-standard-font-lock-fontify-region-function
+ (funcall (default-value 'font-lock-fontify-region-function)
new-beg new-end verbose)))
(defun c-after-font-lock-init ()
;; Put on `font-lock-mode-hook'. This function ensures our after-change
- ;; function will get executed before the font-lock one. Amongst other
- ;; things.
+ ;; function will get executed before the font-lock one.
(remove-hook 'after-change-functions 'c-after-change t)
- (add-hook 'after-change-functions 'c-after-change nil t)
- (setq c-standard-font-lock-fontify-region-function
- (default-value 'font-lock-fontify-region-function)))
+ (add-hook 'after-change-functions 'c-after-change nil t))
(defun c-font-lock-init ()
"Set up the font-lock variables for using the font-lock support in CC Mode.
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 08eb778..c90bf1c 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -954,8 +954,6 @@ If it is a file, return the corresponding cons for the file
itself."
(defvar use-vc-backend) ;; dynamically bound
-;; Autoload cookie needed by desktop.el.
-;;;###autoload
(define-derived-mode vc-dir-mode special-mode "VC dir"
"Major mode for VC directory buffers.
Marking/Unmarking key bindings and actions:
diff --git a/make-dist b/make-dist
index 344de9c..f287606 100755
--- a/make-dist
+++ b/make-dist
@@ -41,8 +41,8 @@ LC_MESSAGES=
LANG=
export LANGUAGE LC_ALL LC_MESSAGES LANG
-## Don't restrict access to any files.
-umask 0
+## Remove unnecessary restrictions on file access.
+umask 022
update=yes
check=yes
diff --git a/nt/INSTALL.OLD b/nt/INSTALL.OLD
index 3e4ab27..a7ce57c 100644
--- a/nt/INSTALL.OLD
+++ b/nt/INSTALL.OLD
@@ -1,7 +1,7 @@
Building and Installing Emacs on Windows
(from 95 to 7 and beyond)
- Copyright (C) 2001-2013 Free Software Foundation, Inc.
+ Copyright (C) 2001-2014 Free Software Foundation, Inc.
See the end of the file for license conditions.
*** This method of building Emacs is no longer supported. ***
diff --git a/src/.gdbinit b/src/.gdbinit
index d259aa4..d76c3aa 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -982,27 +982,6 @@ document xscrollbar
Print $ as a scrollbar pointer.
end
-define xxwidget
- if $argc == 1
- xgetptr $arg0
- else
- xgetptr $
- end
- set $xw = (struct xwidget *) $ptr
- print $xw
- printf " Type: "
- xprintsym $xw->type
- echo \n
- printf " Title: "
- xgetptr $xw->title
- set $title = (struct Lisp_String *) $ptr
- xprintstr $title
- echo \n
-end
-document xxwidget
-Print $ assuming it is a xwidget.
-end
-
define xpr
xtype
if $type == Lisp_Int0 || $type == Lisp_Int1
@@ -1072,9 +1051,6 @@ define xpr
if $vec == PVEC_HASH_TABLE
xhashtable
end
- if $vec == PVEC_XWIDGET
- xxwidget
- end
else
xvector
end