3 files changed, 3 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7cce1f017d7..f5ab88743b1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * sysdep.c (sys_subshell): Remove SET_EMACS_PRIORITY.
+        * emacs.c (emacs_priority, syms_of_emacs): Remove emacs_priority.
+
         * intervals.h (temp_set_point, temp_set_point_both):
         * buffer.h (offset_intervals, copy_intervals): Remove INLINE.
 
diff --git a/src/emacs.c b/src/emacs.c
index 97ffd1a74c7..0d3b37ae27c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -195,11 +195,6 @@ Lisp_Object Vdynamic_library_alist;
    but instead should use the virtual terminal under which it was started.  */
 int inhibit_window_system;
 
-/* If nonzero, set Emacs to run at this priority.  This is also used
-   in child_setup and sys_suspend to make sure subshells run at normal
-   priority; those functions have their own extern declaration.  */
-EMACS_INT emacs_priority;
-
 /* If non-zero, a filter or a sentinel is running.  Tested to save the match
    data on the first attempt to change it inside asynchronous code.  */
 int running_asynch_code;
@@ -2439,15 +2434,6 @@ Before Emacs 24.1, the hook was not run in batch mode, i.e., if
 `noninteractive' was non-nil.  */);
   Vkill_emacs_hook = Qnil;
 
-  DEFVAR_INT ("emacs-priority", &emacs_priority,
-              doc: /* Priority for Emacs to run at.
-This value is effective only if set before Emacs is dumped,
-and only if the Emacs executable is installed with setuid to permit
-it to change priority.  (Emacs sets its uid back to the real uid.)
-Currently, you need to define SET_EMACS_PRIORITY in `config.h'
-before you compile Emacs, to enable the code for this feature.  */);
-  emacs_priority = 0;
-
   DEFVAR_LISP ("path-separator", &Vpath_separator,
                doc: /* String containing the character that separates directories in
 search paths, such as PATH and other similar environment variables.  */);
diff --git a/src/sysdep.c b/src/sysdep.c
index 0c291dd80ac..ac766058d34 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -554,15 +554,6 @@ sys_subshell (void)
 
       close_process_descs ();   /* Close Emacs's pipes/ptys */
 
-#ifdef SET_EMACS_PRIORITY
-      {
-        extern EMACS_INT emacs_priority;
-
-        if (emacs_priority < 0)
-          nice (-emacs_priority);
-      }
-#endif
-
 #ifdef MSDOS    /* Demacs 1.1.2 91/10/20 Manabu Higashida */
       {
         char *epwd = getenv ("PWD");