Update emacs to 23.4.

Emacs 23.4 mainly fixes a security flaw in EDE (CVE-2012-0035), which
was already fixed in emacs-23.3nb1 in pkgsrc.

8 files changed, 11 insertions, 464 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 981a9185bf5..b42d7f28ac5 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2012/02/06 12:39:59 wiz Exp $
-
-PKGREVISION=	2
+# $NetBSD: Makefile,v 1.142 2012/02/19 17:44:35 minskim Exp $
 
 CONFLICTS+=	emacs-nox11-[0-9]*
 
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common
index fdc4334aa6a..46925fe276c 100644
--- a/editors/emacs/Makefile.common
+++ b/editors/emacs/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.33 2012/01/20 04:20:43 obache Exp $
+# $NetBSD: Makefile.common,v 1.34 2012/02/19 17:44:35 minskim Exp $
 #
 # used by editors/emacs/Makefile
 # used by editors/emacs-nox11/Makefile
 
-DISTNAME=	emacs-${EMACS_VERSION}b
+DISTNAME=	emacs-${EMACS_VERSION}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST
index 88d732e9926..f3c889229d4 100644
--- a/editors/emacs/PLIST
+++ b/editors/emacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2011/11/28 16:29:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2012/02/19 17:44:35 minskim Exp $
 bin/b2m
 bin/ctags
 bin/ebrowse
@@ -85,7 +85,7 @@ share/emacs/${EMACS_VERSION}/etc/COPYING
 share/emacs/${EMACS_VERSION}/etc/DEBUG
 share/emacs/${EMACS_VERSION}/etc/DEVEL.HUMOR
 share/emacs/${EMACS_VERSION}/etc/DISTRIB
-share/emacs/${EMACS_VERSION}/etc/DOC-23.3.1
+share/emacs/${EMACS_VERSION}/etc/DOC-${EMACS_VERSION}.1
 share/emacs/${EMACS_VERSION}/etc/ERC-NEWS
 share/emacs/${EMACS_VERSION}/etc/ETAGS.EBNF
 share/emacs/${EMACS_VERSION}/etc/ETAGS.README
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 519b0fd9ac6..5babd8e0e43 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.55 2012/01/19 20:50:00 tez Exp $
+$NetBSD: distinfo,v 1.56 2012/02/19 17:44:35 minskim Exp $
 
-SHA1 (emacs-23.3b.tar.gz) = 56503472e99bc7c875ec370dec7b40774cfa82da
-RMD160 (emacs-23.3b.tar.gz) = d253874ecef5c09d35576cf508727f5863c80834
-Size (emacs-23.3b.tar.gz) = 47930061 bytes
-SHA1 (patch-CVE-2012-0035) = 546dd488256268715e7434def91b42a3709daea2
+SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473
+RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7
+Size (emacs-23.4.tar.gz) = 47721193 bytes
 SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50
 SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e
-SHA1 (patch-ac) = bcaff0bd9039c6326df900044a391e15f744af4a
 SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9
 SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9
 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
 SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3
 SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9
 SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507
-SHA1 (patch-src_unexmacosx.c) = 5821eb65c1e10192a7b2679691e4651b8d9fb263
diff --git a/editors/emacs/patches/patch-CVE-2012-0035 b/editors/emacs/patches/patch-CVE-2012-0035
deleted file mode 100644
index 9476573112b..00000000000
--- a/editors/emacs/patches/patch-CVE-2012-0035
+++ /dev/null
@@ -1,416 +0,0 @@
-$NetBSD: patch-CVE-2012-0035,v 1.1 2012/01/19 20:50:01 tez Exp $
-
-Fix for CVE-2012-0035 from:
- http://bzr.savannah.gnu.org/lh/emacs/emacs-23/revision/100631
-
-=== modified file 'lisp/cedet/ChangeLog'
---- lisp/cedet/ChangeLog.orig	2011-11-26 03:20:20.000000000 +0000
-+++ lisp/cedet/ChangeLog
-@@ -1,3 +1,20 @@
-+2012-01-09  Eric Ludlam  <zappo@gnu.org>
-+
-+	* ede.el (ede-project-directories): New option.
-+	(ede-directory-safe-p): Check it.
-+	(ede-initialize-state-current-buffer, ede, ede-new)
-+	(ede-check-project-directory, ede-rescan-toplevel)
-+	(ede-load-project-file, ede-parent-project, ede-current-project):
-+	(ede-target-parent): Avoid loading in a project unless it is safe,
-+	since it may involve malicious code.  This security flaw was
-+	pointed out by Hiroshi Oota.
-+
-+	* ede/auto.el (ede-project-autoload): Add safe-p slot.
-+	(ede-project-class-files): Projects using Project.ede are unsafe.
-+	(ede-auto-load-project): New method.
-+
-+	* ede/simple.el (ede-project-class-files): Mark as unsafe.
-+
- 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
- 
- 	* Version 23.3 released.
-
-=== modified file 'lisp/cedet/ede.el'
---- lisp/cedet/ede.el	2011-01-02 23:50:46 +0000
-+++ lisp/cedet/ede.el	2012-01-09 06:12:11 +0000
-@@ -94,6 +94,42 @@
-   :group 'ede
-   :type 'sexp) ; make this be a list of options some day
- 
-+(defcustom ede-project-directories nil
-+  "Directories in which EDE may search for project files.
-+If the value is t, EDE may search in any directory.
-+
-+If the value is a function, EDE calls that function with one
-+argument, the directory name; the function should return t iff
-+EDE should look for project files in the directory.
-+
-+Otherwise, the value should be a list of fully-expanded directory
-+names.  EDE searches for project files only in those directories.
-+If you invoke the commands \\[ede] or \\[ede-new] on a directory
-+that is not listed, Emacs will offer to add it to the list.
-+
-+Any other value disables searching for EDE project files."
-+  :group 'ede
-+  :type '(choice (const :tag "Any directory" t)
-+		 (repeat :tag "List of directories"
-+			 (directory))
-+		 (function :tag "Predicate"))
-+  :version "23.4"
-+  :risky t)
-+
-+(defun ede-directory-safe-p (dir)
-+  "Return non-nil if DIR is a safe directory to load projects from.
-+Projects that do not load a project definition as Emacs Lisp code
-+are safe, and can be loaded automatically.  Other project types,
-+such as those created with Project.ede files, are safe only if
-+specified by `ede-project-directories'."
-+  (setq dir (directory-file-name (expand-file-name dir)))
-+  ;; Load only if allowed by `ede-project-directories'.
-+  (or (eq ede-project-directories t)
-+      (and (functionp ede-project-directories)
-+	   (funcall ede-project-directories dir))
-+      (and (listp ede-project-directories)
-+	   (member dir ede-project-directories))))
-+
- 
- ;;; Management variables
- 
-@@ -419,24 +455,42 @@
- Sets buffer local variables for EDE."
-   (let* ((ROOT nil)
- 	 (proj (ede-directory-get-open-project default-directory
--					       'ROOT)))
-+					       'ROOT))
-+	 (projauto nil))
-+
-     (when (or proj ROOT
--	      (ede-directory-project-p default-directory t))
--
--      (when (not proj)
--	;; @todo - this could be wasteful.
--	(setq proj (ede-load-project-file default-directory 'ROOT)))
--
--      (setq ede-object (ede-buffer-object (current-buffer)
-+	      ;; If there is no open project, look up the project
-+	      ;; autoloader to see if we should initialize.
-+	      (setq projauto (ede-directory-project-p default-directory t)))
-+
-+      (when (and (not proj) projauto)
-+
-+	;; No project was loaded, but we have a project description
-+	;; object.  This means that we can check if it is a safe
-+	;; project to load before requesting it to be loaded.
-+
-+	(when (or (oref projauto safe-p)
-+		  ;; The project style is not safe, so check if it is
-+		  ;; in `ede-project-directories'.
-+		  (let ((top (ede-toplevel-project default-directory)))
-+		    (ede-directory-safe-p top)))
-+
-+	  ;; The project is safe, so load it in.
-+	  (setq proj (ede-load-project-file default-directory 'ROOT))))
-+
-+      ;; Only initialize EDE state in this buffer if we found a project.
-+      (when proj
-+
-+	(setq ede-object (ede-buffer-object (current-buffer)
- 					  'ede-object-project))
- 
--      (setq ede-object-root-project
--	    (or ROOT (ede-project-root ede-object-project)))
--
--      (if (and (not ede-object) ede-object-project)
--	  (ede-auto-add-to-target))
--
--      (ede-apply-target-options))))
-+	(setq ede-object-root-project
-+	      (or ROOT (ede-project-root ede-object-project)))
-+
-+	(if (and (not ede-object) ede-object-project)
-+	    (ede-auto-add-to-target))
-+
-+	(ede-apply-target-options)))))
- 
- (defun ede-reset-all-buffers (onoff)
-   "Reset all the buffers due to change in EDE.
-@@ -555,13 +609,73 @@
- 
- ;;; Interactive method invocations
- ;;
--(defun ede (file)
--  "Start up EDE on something.
--Argument FILE is the file or directory to load a project from."
--  (interactive "fProject File: ")
--  (if (not (file-exists-p file))
--      (ede-new file)
--    (ede-load-project-file (file-name-directory file))))
-+(defun ede (dir)
-+  "Start up EDE for directory DIR.
-+If DIR has an existing project file, load it.
-+Otherwise, create a new project for DIR."
-+  (interactive
-+   ;; When choosing a directory to turn on, and we see some directory here,
-+   ;; provide that as the default.
-+   (let* ((top (ede-toplevel-project default-directory))
-+	  (promptdflt (or top default-directory)))
-+     (list (read-directory-name "Project directory: "
-+				promptdflt promptdflt t))))
-+  (unless (file-directory-p dir)
-+    (error "%s is not a directory" dir))
-+  (when (ede-directory-get-open-project dir)
-+    (error "%s already has an open project associated with it" dir))
-+
-+  ;; Check if the directory has been added to the list of safe
-+  ;; directories.  It can also add the directory to the safe list if
-+  ;; the user chooses.
-+  (if (ede-check-project-directory dir)
-+      (progn
-+	;; If there is a project in DIR, load it, otherwise do
-+	;; nothing.
-+	(ede-load-project-file dir)
-+
-+	;; Check if we loaded anything on the previous line.
-+	(if (ede-current-project dir)
-+
-+	    ;; We successfully opened an existing project.  Some open
-+	    ;; buffers may also be referring to this project.
-+	    ;; Resetting all the buffers will get them to also point
-+	    ;; at this new open project.
-+	    (ede-reset-all-buffers 1)
-+
-+	  ;; ELSE
-+	  ;; There was no project, so switch to `ede-new' which is how
-+	  ;; a user can select a new kind of project to create.
-+	  (let ((default-directory (expand-file-name dir)))
-+	    (call-interactively 'ede-new))))
-+
-+    ;; If the proposed directory isn't safe, then say so.
-+    (error "%s is not an allowed project directory in `ede-project-directories'"
-+	   dir)))
-+
-+(defun ede-check-project-directory (dir)
-+  "Check if DIR should be in `ede-project-directories'.
-+If it is not, try asking the user if it should be added; if so,
-+add it and save `ede-project-directories' via Customize.
-+Return nil iff DIR should not be in `ede-project-directories'."
-+  (setq dir (directory-file-name (expand-file-name dir))) ; strip trailing /
-+  (or (eq ede-project-directories t)
-+      (and (functionp ede-project-directories)
-+	   (funcall ede-project-directories dir))
-+      ;; If `ede-project-directories' is a list, maybe add it.
-+      (when (listp ede-project-directories)
-+	(or (member dir ede-project-directories)
-+	    (when (y-or-n-p (format "`%s' is not listed in `ede-project-directories'.
-+Add it to the list of allowed project directories? "
-+				    dir))
-+	      (push dir ede-project-directories)
-+	      ;; If possible, save `ede-project-directories'.
-+	      (if (or custom-file user-init-file)
-+		  (let ((coding-system-for-read nil))
-+		    (customize-save-variable
-+		     'ede-project-directories
-+		     ede-project-directories)))
-+	      t)))))
- 
- (defun ede-new (type &optional name)
-   "Create a new project starting of project type TYPE.
-@@ -596,6 +710,11 @@
-     (error "Cannot create project in non-existent directory %s" default-directory))
-   (when (not (file-writable-p default-directory))
-     (error "No write permissions for %s" default-directory))
-+  (unless (ede-check-project-directory default-directory)
-+    (error "%s is not an allowed project directory in `ede-project-directories'"
-+	   default-directory))
-+  ;; Make sure the project directory is loadable in the future.
-+  (ede-check-project-directory default-directory)
-   ;; Create the project
-   (let* ((obj (object-assoc type 'name ede-project-class-files))
- 	 (nobj (let ((f (oref obj file))
-@@ -629,6 +748,10 @@
- 	(ede-add-subproject pp nobj)
- 	(ede-commit-project pp)))
-     (ede-commit-project nobj))
-+  ;; Once the project is created, load it again.  This used to happen
-+  ;; lazily, but with project loading occurring less often and with
-+  ;; security in mind, this is now the safe time to reload.
-+  (ede-load-project-file default-directory)
-   ;; Have the menu appear
-   (setq ede-minor-mode t)
-   ;; Allert the user
-@@ -651,11 +774,16 @@
- (defun ede-rescan-toplevel ()
-   "Rescan all project files."
-   (interactive)
--  (let ((toppath (ede-toplevel-project default-directory))
--	(ede-deep-rescan t))
--    (project-rescan (ede-load-project-file toppath))
--    (ede-reset-all-buffers 1)
--    ))
-+  (if (not (ede-directory-get-open-project default-directory))
-+      ;; This directory isn't open.  Can't rescan.
-+      (error "Attempt to rescan a project that isn't open")
-+
-+    ;; Continue
-+    (let ((toppath (ede-toplevel-project default-directory))
-+	  (ede-deep-rescan t))
-+
-+      (project-rescan (ede-load-project-file toppath))
-+      (ede-reset-all-buffers 1))))
- 
- (defun ede-new-target (&rest args)
-   "Create a new target specific to this type of project file.
-@@ -891,7 +1019,7 @@
-   ;; Do the load
-   ;;(message "EDE LOAD : %S" file)
-   (let* ((file dir)
--	 (path (expand-file-name (file-name-directory file)))
-+	 (path (file-name-as-directory (expand-file-name dir)))
- 	 (pfc (ede-directory-project-p path))
- 	 (toppath nil)
- 	 (o nil))
-@@ -920,13 +1048,11 @@
-       ;; See if it's been loaded before
-       (setq o (object-assoc (ede-dir-to-projectfile pfc toppath) 'file
- 			    ede-projects))
--      (if (not o)
--	  ;; If not, get it now.
--	  (let ((ede-constructing pfc))
--	    (setq o (funcall (oref pfc load-type) toppath))
--	    (when (not o)
--	      (error "Project type error: :load-type failed to create a project"))
--	    (ede-add-project-to-global-list o)))
-+
-+      ;; If not open yet, load it.
-+      (unless o
-+	(let ((ede-constructing pfc))
-+	  (setq o (ede-auto-load-project pfc toppath))))
- 
-       ;; Return the found root project.
-       (when rootreturn (set rootreturn o))
-@@ -980,13 +1106,7 @@
- 	     (and root
- 		  (ede-find-subproject-for-directory root updir))
- 	     ;; Try the all structure based search.
--	     (ede-directory-get-open-project updir)
--	     ;; Load up the project file as a last resort.
--	     ;; Last resort since it uses file-truename, and other
--	     ;; slow features.
--	     (and (ede-directory-project-p updir)
--		  (ede-load-project-file
--		   (file-name-as-directory updir))))))))))
-+	     (ede-directory-get-open-project updir))))))))
- 
- (defun ede-current-project (&optional dir)
-   "Return the current project file.
-@@ -1000,11 +1120,7 @@
-     ;; No current project.
-     (when (not ans)
-       (let* ((ldir (or dir default-directory)))
--	(setq ans (ede-directory-get-open-project ldir))
--	(or ans
--	    ;; No open project, if this dir pass project-p, then load.
--	    (when (ede-directory-project-p ldir)
--	      (setq ans (ede-load-project-file ldir))))))
-+	(setq ans (ede-directory-get-open-project ldir))))
-     ;; Return what we found.
-     ans))
- 
-@@ -1059,12 +1175,13 @@
-   "Return the project which is the parent of TARGET.
- It is recommended you track the project a different way as this function
- could become slow in time."
--  ;; @todo - use ede-object-project as a starting point.
--  (let ((ans nil) (projs ede-projects))
--    (while (and (not ans) projs)
--      (setq ans (ede-target-in-project-p (car projs) target)
--	    projs (cdr projs)))
--    ans))
-+  (or ede-object-project
-+      ;; If not cached, derive it from the current directory of the target.
-+      (let ((ans nil) (projs ede-projects))
-+	(while (and (not ans) projs)
-+	  (setq ans (ede-target-in-project-p (car projs) target)
-+		projs (cdr projs)))
-+	ans)))
- 
- (defmethod ede-find-target ((proj ede-project) buffer)
-   "Fetch the target in PROJ belonging to BUFFER or nil."
-
-=== modified file 'lisp/cedet/ede/auto.el'
---- lisp/cedet/ede/auto.el	2011-01-02 23:50:46 +0000
-+++ lisp/cedet/ede/auto.el	2012-01-09 06:12:11 +0000
-@@ -58,6 +58,13 @@
- 	  :initform t
- 	  :documentation
- 	  "Non-nil if this is an option when a user creates a project.")
-+   (safe-p :initarg :safe-p
-+	   :initform t
-+	   :documentation
-+	   "Non-nil if the project load files are \"safe\".
-+An unsafe project is one that loads project variables via Emacs
-+Lisp code.  A safe project is one that loads project variables by
-+scanning files without loading Lisp code from them.")
-    )
-   "Class representing minimal knowledge set to run preliminary EDE functions.
- When more advanced functionality is needed from a project type, that projects
-@@ -69,13 +76,15 @@
- 			 :name "Make" :file 'ede/proj
- 			 :proj-file "Project.ede"
- 			 :load-type 'ede-proj-load
--			 :class-sym 'ede-proj-project)
-+			 :class-sym 'ede-proj-project
-+			 :safe-p nil)
-    (ede-project-autoload "edeproject-automake"
- 			 :name "Automake" :file 'ede/proj
- 			 :proj-file "Project.ede"
- 			 :initializers '(:makefile-type Makefile.am)
- 			 :load-type 'ede-proj-load
--			 :class-sym 'ede-proj-project)
-+			 :class-sym 'ede-proj-project
-+			 :safe-p nil)
-    (ede-project-autoload "automake"
- 			 :name "automake" :file 'ede/project-am
- 			 :proj-file "Makefile.am"
-@@ -84,6 +93,8 @@
- 			 :new-p nil))
-   "List of vectors defining how to determine what type of projects exist.")
- 
-+(put 'ede-project-class-files 'risky-local-variable t)
-+
- ;;; EDE project-autoload methods
- ;;
- (defmethod ede-project-root ((this ede-project-autoload))
-@@ -122,6 +133,19 @@
-     (when (and f (file-exists-p f))
-       f)))
- 
-+(defmethod ede-auto-load-project ((this ede-project-autoload) dir)
-+  "Load in the project associated with THIS project autoload description.
-+THIS project description should be valid for DIR, where the project will
-+be loaded."
-+  ;; Last line of defense: don't load unsafe projects.
-+  (when (not (or (oref this :safe-p)
-+		 (ede-directory-safe-p dir)))
-+    (error "Attempt to load an unsafe project (bug elsewhere in EDE)"))
-+  ;; Things are good - so load the project.
-+  (let ((o (funcall (oref this load-type) dir)))
-+    (when (not o)
-+      (error "Project type error: :load-type failed to create a project"))
-+    (ede-add-project-to-global-list o)))
- 
- (provide 'ede/auto)
- 
-
-=== modified file 'lisp/cedet/ede/simple.el'
---- lisp/cedet/ede/simple.el	2011-01-02 23:50:46 +0000
-+++ lisp/cedet/ede/simple.el	2012-01-09 06:12:11 +0000
-@@ -50,7 +50,8 @@
- 	      :name "Simple" :file 'ede/simple
- 	      :proj-file 'ede-simple-projectfile-for-dir
- 	      :load-type 'ede-simple-load
--	      :class-sym 'ede-simple-project)
-+	      :class-sym 'ede-simple-project
-+	      :safe-p nil)
- 	     t)
- 
- (defcustom ede-simple-save-directory "~/.ede"
-
diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac
deleted file mode 100644
index 1ff2a5a73f9..00000000000
--- a/editors/emacs/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.22 2011/12/03 22:46:30 jmmv Exp $
-
-http://lists.gnu.org/archive/html/emacs-bug-tracker/2011-07/msg00445.html
-
-Bug #8395: Disable address randomization under Darwin to fix compilation
-with Xcode 4.1.
-
---- src/s/darwin.h.orig	2011-11-26 03:20:20.000000000 +0000
-+++ src/s/darwin.h
-@@ -181,7 +181,7 @@ along with GNU Emacs.  If not, see <http
-    end of the header for adding load commands.  Needed for dumping.
-    0x690 is the total size of 30 segment load commands (at 56
-    each); under Cocoa 31 commands are required.  */
--#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
-+#define LD_SWITCH_SYSTEM_TEMACS -fno-pie -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
- 
- #define C_SWITCH_SYSTEM_TEMACS -Dtemacs
- 
diff --git a/editors/emacs/patches/patch-src_unexmacosx.c b/editors/emacs/patches/patch-src_unexmacosx.c
deleted file mode 100644
index 707fe3f727f..00000000000
--- a/editors/emacs/patches/patch-src_unexmacosx.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_unexmacosx.c,v 1.1 2011/09/15 22:06:38 minskim Exp $
-
-Upstream git commit c8bba48c5889c4773c62a10f7c3d4383881f11c1.
-
---- src/unexmacosx.c.orig	2011-01-08 17:45:14.000000000 +0000
-+++ src/unexmacosx.c
-@@ -823,6 +823,7 @@ copy_data_segment (struct load_command *
-       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
- 	       || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
- 	       || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
-+	       || strncmp (sectp->sectname, "__got", 16) == 0
- 	       || strncmp (sectp->sectname, "__dyld", 16) == 0
- 	       || strncmp (sectp->sectname, "__const", 16) == 0
- 	       || strncmp (sectp->sectname, "__cfstring", 16) == 0
diff --git a/editors/emacs/version.mk b/editors/emacs/version.mk
index a423b5ff52e..021216b7996 100644
--- a/editors/emacs/version.mk
+++ b/editors/emacs/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.7 2011/06/09 13:47:31 drochner Exp $
+# $NetBSD: version.mk,v 1.8 2012/02/19 17:44:35 minskim Exp $
 
 _EMACS_FLAVOR=	emacs
 _EMACS_REQD=	emacs>=23.2<24
 
 _EMACS_VERSION_MAJOR=	23
-_EMACS_VERSION_MINOR=	3
+_EMACS_VERSION_MINOR=	4