From dee091a37f6486dbbcf7bf00f6ee54d77033f997 Mon Sep 17 00:00:00 2001
From: Julien Danjou
Date: Wed, 23 Mar 2011 11:06:57 +0100
Subject: Use Frun_hooks rather than calling Vrun_hooks manually

---
 src/buffer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/buffer.c')

diff --git a/src/buffer.c b/src/buffer.c
index c0e6866dee1..da2cc1573c8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2520,8 +2520,7 @@ The first thing this function does is run
 the normal hook `change-major-mode-hook'.  */)
   (void)
 {
-  if (!NILP (Vrun_hooks))
-    call1 (Vrun_hooks, Qchange_major_mode_hook);
+  Frun_hooks (1, &Qchange_major_mode_hook);
 
   /* Make sure none of the bindings in local_var_alist
      remain swapped in, in their symbols.  */
-- 
cgit v1.2.1


From 6b1f9ba4770e8f488c378cfa87dc868cad62c436 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero
Date: Fri, 25 Mar 2011 19:06:33 +0100
Subject: src/*.c: Remove unused function parameters.

* buffer.c (defvar_per_buffer): Remove unused parameter `doc'.
  (DEFVAR_PER_BUFFER): Don't pass it.
* dispnew.c (row_equal_p, add_row_entry): Remove unused parameter `w'.
  (scrolling_window): Don't pass it.
---
 src/buffer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/buffer.c')

diff --git a/src/buffer.c b/src/buffer.c
index da2cc1573c8..8b56b285e48 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5224,12 +5224,12 @@ init_buffer (void)
 #define DEFVAR_PER_BUFFER(lname, vname, type, doc)			\
   do {									\
     static struct Lisp_Buffer_Objfwd bo_fwd;				\
-    defvar_per_buffer (&bo_fwd, lname, vname, type, 0);			\
+    defvar_per_buffer (&bo_fwd, lname, vname, type);			\
   } while (0)
 
 static void
 defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring,
-		   Lisp_Object *address, Lisp_Object type, char *doc)
+		   Lisp_Object *address, Lisp_Object type)
 {
   struct Lisp_Symbol *sym;
   int offset;
-- 
cgit v1.2.1