* editfns.c (Fuser_full_name): Replace the only use of

USER_FULL_NAME with its value.
* config.in: Regenerate.

* configure.in (freebsd, kfreebsd): Undo part of previous change.
(USER_FULL_NAME): Remove, not used anymore.
* configure: Regenerate.

3 files changed, 7 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a71765c29b..491931820ec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-16  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * editfns.c (Fuser_full_name): Replace the only use of
+        USER_FULL_NAME with its value.
+        * config.in: Regenerate.
+
 2008-07-16  David Reitter <david.reitter@gmail.com>
 
         * Makefile.in: add ns-win, ns-carbon-compat, easy-mmode and
diff --git a/src/config.in b/src/config.in
index 714d1d44f80..94750388c24 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1001,17 +1001,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef MAC_OS
 #undef MAC_OSX
 
-/* Define USER_FULL_NAME to return a string
-   that is the user's full name.
-   It can assume that the variable `pw'
-   points to the password file entry for this user.
-
-   At some sites, the pw_gecos field contains
-   the user's full name.  If neither this nor any other
-   field contains the right thing, use pw_name,
-   giving the user's login name, since that is better than nothing.  */
-#define USER_FULL_NAME pw->pw_gecos
-
 /* Define AMPERSAND_FULL_NAME if you use the convention
    that & in the full name stands for the login id.  */
 /* Turned on June 1996 supposing nobody will mind it.  */
diff --git a/src/editfns.c b/src/editfns.c
index 0487ecf4707..71973cec914 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1370,7 +1370,7 @@ name, or nil if there is no such user.  */)
   if (!pw)
     return Qnil;
 
-  p = (unsigned char *) USER_FULL_NAME;
+  p = (unsigned char *) pw->pw_gecos;
   /* Chop off everything after the first comma. */
   q = (unsigned char *) index (p, ',');
   full = make_string (p, q ? q - p : strlen (p));